Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master' ...

Conflicts:
	apps/opencs/editor.cpp

2013-11-10 11:49:48 +01:00

..

oics

cmake option to use system tinyxml instead of embedded one

2013-09-13 15:11:17 +02:00

sdl4ogre

Merge remote-tracking branch 'scrawl/master'

2013-11-10 11:49:48 +01:00

shiny

Fix a typo, caused occasional white spots on local map render

2013-08-09 21:29:43 +02:00