Marc Zinnschlag 6ac64bbe15 Merge branch 'script' ...

Conflicts:
	readme.txt

2014-02-16 12:12:56 +01:00

..

model

Merge branch 'script'

2014-02-16 12:12:56 +01:00

view

Merge remote-tracking branch 'sirherrbatka/DragDrop'

2014-02-14 14:28:30 +01:00

CMakeLists.txt

Merge branch 'script'

2014-02-16 12:12:56 +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