Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 15:54:39 +0000 (17:54 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 15:54:39 +0000 (17:54 +0200)
commitf1091cc7a1e77ffbf261907cb325c46cdd22a58f
tree2a6523d2504b43eafd791f05cc47497160cc3d88
parent33b9faedac2e533cc40cd742bc91109b70e11041
parentc3b65641f6ba82a8e001ab57b5d9117f907e7669
Merge branch 'master' of ssh://git.xonotic.org/xonotic