From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 18 Sep 2013 09:43:20 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/desktopfullscreen
X-Git-Tag: xonotic-v0.8.0~315^2~2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=836a4c13102f402edcbf6f29160f84b8a70d2648;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/desktopfullscreen
---

836a4c13102f402edcbf6f29160f84b8a70d2648