cc9cii fb2ba7610c Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/idtable.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp

2015-03-04 11:22:42 +11:00

..

doc

Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields

2015-03-04 11:22:42 +11:00

filter

cleaned up some enum confusion

2015-01-15 12:01:59 +01:00

settings

Add function to cancel drag by pressing ESC. Remove debug code.

2014-11-03 21:24:47 +11:00

tools

Merge remote-tracking branch 'naclander/master'

2015-03-01 10:23:08 +01:00

world

Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields

2015-03-04 11:22:42 +11:00