cc9cii 84f0ddd51c Merge branch 'master' into pathgrid-edit ... Conflicts: apps/opencs/view/render/cell.cpp apps/opencs/view/render/mousestate.cpp apps/opencs/view/render/object.cpp apps/opencs/view/render/object.hpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/unpagedworldspacewidget.cpp apps/opencs/view/render/worldspacewidget.cpp		2014-12-09 14:02:26 +11:00
..
model	move cursor in scripteditor to position of error	2014-12-08 12:29:23 +01:00
view	Merge branch 'master' into pathgrid-edit	2014-12-09 14:02:26 +11:00
CMakeLists.txt	Merge branch 'master' into pathgrid-edit	2014-12-09 14:02:26 +11:00
editor.cpp	Merge branch 'master' into pathgrid-edit	2014-12-09 14:02:26 +11: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	Allow only one instance of OpenCS. Only tested on windows x64.	2014-12-05 01:09:42 +11:00