Merge branch 'getopt' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Wed, 10 Nov 2010 03:25:58 +0000 (22:25 -0500)
committerMarkus Schulz <schulz@alpharesearch.de>
Wed, 10 Nov 2010 03:25:58 +0000 (22:25 -0500)
commita4aba3241b37b831249504df800a3d672b4c15f0
treeda8c06354be9c0cb62a2547c2d9b87b11a2e42bb
parentc8066c02f4fc1e464d6ff14daf52871348bf80a2
parentdf40da89f22bc5a82ca35229260514da258c0e46
Merge branch 'getopt' into systemtest

Conflicts:
MainWindow.cpp
main.cpp
MainWindow.cpp
MainWindow.h
Plotter.cpp
Robocut.pro