Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp		2013-11-10 13:21:39 +01:00
..
model	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
view	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
CMakeLists.txt	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
editor.cpp	Merge remote-tracking branch 'scrawl/master'	2013-11-10 11:49:48 +01:00
editor.hpp	Fix for file path issues	2013-10-26 22:55:44 -05:00
main.cpp	Merge remote-tracking branch 'scrawl/master'	2013-11-10 11:49:48 +01:00