From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 11 Oct 2013 14:57:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/divVerent/xoylent_sRGB'
X-Git-Tag: xonotic-v0.8.0~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9dbd16ca8688fbd7803cd9ec5a4d2c0ddae419e4;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/divVerent/xoylent_sRGB'
---

9dbd16ca8688fbd7803cd9ec5a4d2c0ddae419e4