From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 24 Sep 2014 10:26:01 +0000 (+0200)
Subject: Merge branch 'sev/menu_colorbutton_clean'
X-Git-Tag: xonotic-v0.8.0~179
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f1297c955ff567121bee040ee94f5b4022d046f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/menu_colorbutton_clean'
---

3f1297c955ff567121bee040ee94f5b4022d046f