]> 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: e8f8cb2 aced7cb)
Merge remote-tracking branch 'origin/mand1nga/bot-assault'
authormand1nga <mand1nga@xonotic.org>
Wed, 17 Aug 2011 22:37:49 +0000 (19:37 -0300)
committermand1nga <mand1nga@xonotic.org>
Wed, 17 Aug 2011 22:37:49 +0000 (19:37 -0300)

Trivial merge