Marek Kochanowicz 269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix ... Conflicts: CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/world/dialoguesubview.cpp		2014-06-09 11:51:41 +02:00
..
model	Merge remote-tracking branch 'master/refs' into dialog-fix	2014-06-09 11:51:41 +02:00
view	Merge remote-tracking branch 'master/refs' into dialog-fix	2014-06-09 11:51:41 +02:00
CMakeLists.txt	factored out command creation from table view into a separate class	2014-06-06 12:43:21 +02:00
editor.cpp	text encoding configuration (was using hardcoded settings before)	2014-05-12 10:32:57 +02:00
editor.hpp	Merge branch 'master' into load	2014-05-03 14:36:06 +02:00
main.cpp	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00