]> de.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: 70ca128 be716b6)
Merge remote branch 'origin/terencehill/hud_panel_powerups_text_fix'
authormand1nga <mand1nga@xonotic.org>
Sat, 9 Apr 2011 01:17:38 +0000 (22:17 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 9 Apr 2011 01:17:38 +0000 (22:17 -0300)

Trivial merge