]> 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: 4a26c1a fd27411)
Merge remote branch 'origin/samual/balance'
authormand1nga <mand1nga@xonotic.org>
Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)

Trivial merge