cc9cii 258b2ba29a Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.		2015-09-12 09:04:43 +10:00
..
model	Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.	2015-09-12 09:04:43 +10:00
view	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
CMakeLists.txt	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
editor.cpp	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
main.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00