Marc Zinnschlag e4381c3ec8 added merge operation (doesn't do anything yet) ... (cherry picked from commit 904ad94952) Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/tools/tools.cpp		2015-11-01 13:25:34 +11:00
..
doc	added merge operation (doesn't do anything yet)	2015-11-01 13:25:34 +11:00
filter	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
settings	Rewording of the user setting for extended configuration	2015-07-30 09:32:58 +10:00
tools	added merge operation (doesn't do anything yet)	2015-11-01 13:25:34 +11:00
world	Add missing includes to columnimp.hpp	2015-09-08 06:48:04 +10:00