]> 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: f2d298b f62aa0e)
Merge remote branch 'origin/mand1nga/bot-debug'
authormand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:37:40 +0000 (22:37 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:37:40 +0000 (22:37 -0300)

Trivial merge