cc9cii 8af12788a4 Merge branch 'master' into autocalc ...

Conflicts:
	apps/opencs/view/world/util.cpp

2015-06-24 21:16:48 +10:00

..

doc

calm down travis

2015-06-20 19:46:38 +02:00

filter

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

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

settings

add normal script warnings mode (Fixes #2642)

2015-06-20 19:16:15 +02:00

tools

add normal script warnings mode (Fixes #2642)

2015-06-20 19:16:15 +02:00

world

Merge branch 'master' into autocalc

2015-06-24 21:16:48 +10:00