]> git.rm.cloudns.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:19:35 +0000 (15:19 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 28 Aug 2011 18:19:35 +0000 (15:19 -0300)
commit4def7f15028822721a4c3920b5f2fb8019889b36
tree2c4189afe2357ee1753565d09e0b3783ccbcd7fa
parentdceb76710d27bc32f51b3cb7b45d24c0a18b0fdf
parentc8216300d49616ff3124e43af90432868a34a3f2
Merge branch 'master' into mand1nga/bot-fixes-II
defaultXonotic.cfg