]> 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: 69e0872 bebeaf5)
Merge remote branch 'origin/mand1nga/fix-bot-wandering'
authormand1nga <mand1nga@xonotic.org>
Fri, 22 Apr 2011 00:57:19 +0000 (21:57 -0300)
committermand1nga <mand1nga@xonotic.org>
Fri, 22 Apr 2011 00:57:19 +0000 (21:57 -0300)

Trivial merge