Marc Zinnschlag 23ccee0124 Merge remote-tracking branch 'dieho/master' ...

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

2015-08-08 11:00:44 +02:00

..

doc

incorrect sBribe GMSTs for new omwgame files (Fixes #2785)

2015-07-18 17:47:50 +02:00

filter

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

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

settings

Update to upstream/master. Resolve merge conflicts

2015-07-27 13:54:13 +03:00

tools

Remove check for an empty Particle from Magic effects verifier

2015-08-06 14:17:42 +03:00

world

#2730 and #2725

2015-08-04 16:58:44 +03:00