]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Sun, 28 Aug 2011 18:27:36 +0000 (15:27 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 28 Aug 2011 18:27:36 +0000 (15:27 -0300)
commite621c3ae269746abe26fdc553a0a8fb79954efc2
tree2c4189afe2357ee1753565d09e0b3783ccbcd7fa
parent4def7f15028822721a4c3920b5f2fb8019889b36
parent12c9954950d1269d8eace11c19f9699506291c59
Merge branch 'master' into mand1nga/bot-fixes-II