Merge branch 'sorting' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Sat, 6 Nov 2010 18:57:00 +0000 (14:57 -0400)
committerMarkus Schulz <schulz@alpharesearch.de>
Sat, 6 Nov 2010 18:57:00 +0000 (14:57 -0400)
commit22754b0bb681f35d4d579f9aa9600e4227ed5fd5
tree22bf27171d579e91f37da47928bd560a96cde161
parent65093731b3272c00bdc6a2133b0a44ce441ef961
parent26216badde49f53496d5a06ba941b1a8b7254893
Merge branch 'sorting' into systemtest
MainWindow.cpp