Merge branch 'getopt' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Sat, 6 Nov 2010 19:03:44 +0000 (15:03 -0400)
committerMarkus Schulz <schulz@alpharesearch.de>
Sat, 6 Nov 2010 19:03:44 +0000 (15:03 -0400)
commit1f7515e57fed27e5c971838819eec7b981fb73e4
treeea7abb7ab1c78d29d082f3b4c231e39581b68295
parent22754b0bb681f35d4d579f9aa9600e4227ed5fd5
parent9da607f1b5e565f9de5089250ae7bd79e07f7886
Merge branch 'getopt' into systemtest

Conflicts:
MainWindow.cpp
MainWindow.h
MainWindow.cpp
MainWindow.h