]> 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: 03ad259 3873035)
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 01:45:28 +0000 (22:45 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 01:45:28 +0000 (22:45 -0300)

Trivial merge