cc9cii 2612a91f8d Merge branch 'master' into autocalc ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.hpp
	apps/opencs/view/world/dialoguesubview.cpp

2015-06-27 07:46:36 +10:00

..

model

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

view

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

CMakeLists.txt

Merge branch 'master' into autocalc

2015-06-27 07:46:36 +10:00

editor.cpp

fix typo

2015-06-16 13:09:44 +10:00

editor.hpp

Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.

2015-06-16 12:48:45 +10:00

main.cpp

standarised on the use of the Message struct when passing operations messages around

2015-06-20 17:56:42 +02:00