Merge branch 'sorting' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Fri, 12 Nov 2010 02:26:03 +0000 (21:26 -0500)
committerMarkus Schulz <schulz@alpharesearch.de>
Fri, 12 Nov 2010 02:26:03 +0000 (21:26 -0500)
commitff5e6e6a64462451e501d41266a3c2e14c3cd6d5
tree89dcccf6092ed28b09ee944d2500eef85d9647be
parent7cde248978a1ab8c45bc25a1d668a7df670a422b
parentf0b3e9e1b74dc42b4a4596fa19d3844356731d4d
Merge branch 'sorting' into systemtest

Conflicts:
MainWindow.cpp
MainWindow.cpp