cc9cii f989bfcd42 Merge branch 'master' into cc9cii ...

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp

2015-06-09 19:42:37 +10:00

..

doc

Add missing new lines at the ends of files

2015-05-31 18:18:49 +03:00

filter

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

settings

Merge branch 'master' into cc9cii

2015-06-09 19:42:37 +10:00

tools

Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.

2015-05-30 21:12:47 +10:00

world

Fix missing columns in tables. Should resolve Bug #2624.

2015-06-08 08:04:18 +10:00