cc9cii 3b27e643b8 Merge branch 'master' into cc9cii ... Conflicts: apps/opencs/view/doc/view.hpp		2015-06-19 07:49:18 +10:00
..
model	Merge branch 'master' into cc9cii	2015-06-19 07:49:18 +10:00
view	Merge branch 'master' into cc9cii	2015-06-19 07:49:18 +10:00
CMakeLists.txt	Merge remote-tracking branch 'smbas/feature-color-picking'	2015-06-18 16:37:49 +02:00
editor.cpp	Merge branch 'master' into cc9cii	2015-06-19 07:49:18 +10:00
editor.hpp	Merge branch 'master' into cc9cii	2015-06-19 07:49:18 +10:00
main.cpp	renamed opencs into openmw-cs	2015-02-03 13:18:03 +01:00