Merge branch 'sorting' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Thu, 11 Nov 2010 04:06:01 +0000 (23:06 -0500)
committerMarkus Schulz <schulz@alpharesearch.de>
Thu, 11 Nov 2010 04:06:01 +0000 (23:06 -0500)
commit4ba1f252089ad27f463a7ebb5ded6e924a8e2783
tree8f387c587bffa8ec0ad6558f1050697714ed7e9c
parent85fd4c2be243bbcbda6c54d64cbcdd70f33a59b0
parent31461cd79d47d1480073e259c8a6f8231c8bc27c
Merge branch 'sorting' into systemtest

Conflicts:
MainWindow.cpp
Robocut.pro
MainWindow.cpp
Robocut.pro