cc9cii 5eefcd862f Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/tools/tools.cpp apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/idtable.hpp apps/opencs/model/world/refidadapter.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/view/world/dialoguesubview.hpp		2015-03-16 10:30:54 +11:00
..
doc	Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'	2015-03-14 14:25:49 +01:00
filter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
settings	Add function to cancel drag by pressing ESC. Remove debug code.	2014-11-03 21:24:47 +11:00
tools	Merge branch 'threadfix'	2015-03-14 12:00:35 +01:00
world	Merge branch 'master' into NonTableFields	2015-03-16 10:30:54 +11:00