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
..
doc	added meta data dialogue sub view	2015-06-26 16:11:00 +02:00
filter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
render	Add support to build with Qt5 (Task #2665)	2015-06-12 15:13:42 +02:00
settings	Add support to build with Qt5 (Task #2665)	2015-06-12 15:13:42 +02:00
tools	update refresh menu item on stateChanged signal instead of when opening the menu	2015-06-25 13:05:57 +02:00
widget	Proper conversion to QString for DropLineEdit::dropEvent()	2015-06-25 19:30:53 +03:00
world	Merge branch 'master' into autocalc	2015-06-27 07:46:36 +10:00