]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b788b5d 9f5a8e0)
Merge branch 'fruitiex/hud_effect_from_goldenhealth'
authormand1nga <mand1nga@xonotic.org>
Mon, 11 Apr 2011 12:39:26 +0000 (09:39 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 11 Apr 2011 12:39:26 +0000 (09:39 -0300)

Trivial merge