Merge branch 'ifmaxmoveonly' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Sun, 7 Nov 2010 19:27:52 +0000 (14:27 -0500)
committerMarkus Schulz <schulz@alpharesearch.de>
Sun, 7 Nov 2010 19:27:52 +0000 (14:27 -0500)
commite19e653e23dc78016d7aa9c6f8554bb8df657610
tree9c46f75e5cbae6bb36fdd068ca08f10dcc1d806f
parentfcc4cb565b56ebb3676262122b9943462f9bca47
parente975e7e074fbf97bc0a4aae21e1707d7dfe9ac8f
Merge branch 'ifmaxmoveonly' into systemtest

Conflicts:
Plotter.cpp
Plotter.cpp