]> 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: 33e55ff cf44fd3)
Merge remote-tracking branch 'origin/sev/menu_text_colors'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 15 Sep 2014 19:17:14 +0000 (21:17 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 15 Sep 2014 19:17:14 +0000 (21:17 +0200)

Trivial merge