cc9cii c721e340d8 Merge branch 'master' into npc-additional-data ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp		2015-05-24 19:24:27 +10:00
..
model	Merge branch 'master' into npc-additional-data	2015-05-24 19:24:27 +10:00
view	Merge branch 'master' into npc-additional-data	2015-05-24 19:24:27 +10:00
CMakeLists.txt	Updates to optional horizontal scrollbar.	2015-05-18 07:12:02 +10:00
editor.cpp	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
editor.hpp	Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582)	2014-12-05 07:50:03 +11:00
main.cpp	renamed opencs into openmw-cs	2015-02-03 13:18:03 +01:00