]> 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: ac3763d 69e0872)
Merge branch 'master' into mand1nga/fix-bot-wandering
authormand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:35:14 +0000 (20:35 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:35:14 +0000 (20:35 -0300)

Trivial merge