]> 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: f29e68a 9df92eb)
Merge remote branch 'origin/morphed/hpitems'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)

Trivial merge