]> 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: f7f36e7 25e0877)
Merge remote branch 'origin/mand1nga/bot-misc-fixes'
authormand1nga <mand1nga@xonotic.org>
Wed, 13 Apr 2011 14:37:01 +0000 (11:37 -0300)
committermand1nga <mand1nga@xonotic.org>
Wed, 13 Apr 2011 14:37:01 +0000 (11:37 -0300)

Trivial merge