Stanislav Bas a120bb2b54 Delete infos of deleted dialogue when loading a content file ... (cherry picked from commit e04e32bcff)		2015-12-05 09:46:53 +11:00
..
model	Delete infos of deleted dialogue when loading a content file	2015-12-05 09:46:53 +11:00
view	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
CMakeLists.txt	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
editor.cpp	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
main.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00