cc9cii f7598a67f4 Merge branch 'pathgrid-edit' into Feature-1278 ...

Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp

2015-11-07 11:56:34 +11:00

..

model

Merge branch 'master' into pathgrid-edit

2015-06-07 20:15:58 +10:00

view

Merge branch 'pathgrid-edit' into Feature-1278

2015-11-07 11:56:34 +11:00

CMakeLists.txt

Merge branch 'master' into pathgrid-edit

2015-06-07 20:15:58 +10:00

editor.cpp

Merge branch 'master' into pathgrid-edit

2015-05-31 11:12:39 +10:00

editor.hpp

Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588.

2015-05-30 08:37:58 +10:00

main.cpp

renamed opencs into openmw-cs

2015-02-03 13:18:03 +01:00