]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Tue, 23 Aug 2011 22:23:30 +0000 (19:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 23 Aug 2011 22:23:30 +0000 (19:23 -0300)
commitdceb76710d27bc32f51b3cb7b45d24c0a18b0fdf
treeb4d1c4dcfd5fc9f09e2e59545c25157123557278
parent8f3e121416d5952f8e07bd05751e3580031f599c
parentd1f340f96aec9b414005bb19b4ba463781f23df5
Merge branch 'master' into mand1nga/bot-fixes-II
defaultXonotic.cfg