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	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
filter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
render	Yet more warnings suppressed.	2015-03-14 12:42:46 +11:00
settings	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
tools	Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.	2015-03-14 19:41:55 +11:00
widget	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
world	Merge branch 'master' into NonTableFields	2015-03-16 10:30:54 +11:00