]> 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: f286647 d17eaa6)
Merge branch 'master' into mand1nga/bot-assault
authormand1nga <mand1nga@xonotic.org>
Wed, 17 Aug 2011 00:46:04 +0000 (21:46 -0300)
committermand1nga <mand1nga@xonotic.org>
Wed, 17 Aug 2011 00:46:04 +0000 (21:46 -0300)

Trivial merge