Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp		2013-10-21 16:45:43 +02:00
..
model	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
view	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
CMakeLists.txt	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
editor.cpp	giving Documents direct access to ConfigurationManager	2013-09-27 15:24:58 +02:00
editor.hpp	create project file when saving content file	2013-09-27 11:36:06 +02:00
main.cpp	Renamed esxSelector to contentSelector	2013-09-21 23:06:29 -05:00