1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
openmw-tes3mp/apps/opencs
cc9cii 47d5eac290 Merge branch 'master' into NonTableFields
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
..
model Merge branch 'master' into NonTableFields 2015-04-17 12:37:34 +10:00
view Merge branch 'master' into NonTableFields 2015-04-17 12:37:34 +10:00
CMakeLists.txt Merge branch 'master' into NonTableFields 2015-04-17 12:37:34 +10:00
editor.cpp renamed opencs into openmw-cs 2015-02-03 13:18:03 +01: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