cc9cii a02448f0ba Merge branch 'master' into pathgrid-edit ... Conflicts: apps/opencs/view/render/cell.cpp apps/opencs/view/render/mousestate.cpp		2015-05-31 11:12:39 +10:00
..
model	Merge branch 'master' into pathgrid-edit	2015-05-31 11:12:39 +10:00
view	Merge branch 'master' into pathgrid-edit	2015-05-31 11:12:39 +10:00
CMakeLists.txt	Merge branch 'master' into pathgrid-edit	2015-05-31 11:12:39 +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