]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37afc01 c574ecc)
Merge branch 'sev/menu_colorbutton_clean'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Sep 2014 10:26:01 +0000 (12:26 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Sep 2014 10:26:01 +0000 (12:26 +0200)

Trivial merge