From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 11 Nov 2012 15:36:25 +0000 (+0100)
Subject: Merge branch 'master' into menus
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=f552d26f537af9fa48255bd71cdc1a0a1b860bac;p=l2e.git

Merge branch 'master' into menus

I'm not putting up with changing build settings on every checkout

Conflicts:
	Debug/makefile
	Debug/sources.mk
	Debug/src/graphics/subdir.mk
	Release/makefile
	Release/sources.mk
	Release/src/graphics/subdir.mk
---

f552d26f537af9fa48255bd71cdc1a0a1b860bac