Marc Zinnschlag 053b3dc371 Merge branch 'openmw-28' ... Conflicts: CMakeLists.txt		2014-02-13 20:57:28 +01:00
..
model	use case-insensitive sorting in columns	2014-02-13 15:01:10 +01:00
view	Merge branch 'openmw-28'	2014-02-13 20:57:28 +01:00
CMakeLists.txt	Merge remote-tracking branch 'sirherrbatka/referencables_verifer'	2014-01-15 14:29:54 +01:00
editor.cpp	Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28	2014-01-08 20:16:39 +01:00
editor.hpp	Fix for file path issues	2013-10-26 22:55:44 -05:00
main.cpp	temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)	2014-01-01 15:16:51 +01:00