Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:31:53 +0000 (08:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:31:53 +0000 (08:31 +0200)
commit9915810783acd33b98183515f5625aa21f2e3458
treeac343d7827f00cfd420894c373190d78c1b5d251
parent3290b2ef0dcf4e90b7f56d877b6d1b53918eaa81
parentb60cfbb1ea312f06180945a91a616a5273d7c216
Merge branch 'master' of ssh://git.xonotic.org/xonotic