Marc Zinnschlag 1d34f5e096 Merge remote-tracking branch 'sirherrbatka/cloning' ...

Conflicts:
	apps/opencs/model/world/refiddata.cpp

2014-01-28 12:40:14 +01:00

..

doc

XDG compliant paths

2013-12-26 20:53:51 +01:00

filter

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00

settings

XDG compliant paths

2013-12-26 20:53:51 +01:00

tools

Being any idiot is hard.

2014-01-15 12:52:38 +01:00

world

Merge remote-tracking branch 'sirherrbatka/cloning'

2014-01-28 12:40:14 +01:00