]> 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: 4b60277 2c626f4)
Merge remote branch 'origin/fruitiex/mapvote_fix'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)

Trivial merge