Marc Zinnschlag ef1e01639e added UI for merge tool (merge tool itself is still missing) ... (cherry picked from commit b83f9445a9) Conflicts: apps/opencs/editor.cpp apps/opencs/editor.hpp		2015-11-01 13:22:42 +11:00
..
doc	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +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	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
world	Add missing includes to columnimp.hpp	2015-09-08 06:48:04 +10:00