Marc Zinnschlag 0b8e04d6a8 forgot to connect merge operation signals ... (cherry picked from commit d8655f2ff8)		2015-11-01 13:25:59 +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	forgot to connect merge operation signals	2015-11-01 13:25:59 +11:00
world	Add missing includes to columnimp.hpp	2015-09-08 06:48:04 +10:00