cc9cii f029682057 Merge branch 'cc9cii' into minor-enhancements ...

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/refidcollection.cpp

2015-12-05 19:55:32 +11:00

..

model

Merge branch 'cc9cii' into minor-enhancements

2015-12-05 19:55:32 +11:00

view

Merge branch 'cc9cii' into minor-enhancements

2015-12-05 19:55:32 +11:00

CMakeLists.txt

Move NPC autocal code out to a separate class.

2015-11-08 06:02:53 +11:00

editor.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

editor.hpp

added UI for merge tool (merge tool itself is still missing)

2015-11-01 13:22:42 +11:00

main.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00