Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000 (20:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000 (20:38 +0100)
commitbdc9d82566d9ec5ad934c2ddcf32244e3aee02e3
tree53745fa547454dbc5368f910ca3cc86a1d7b18ef
parent1c355a22bea8fb50cd1e710ad5af257581156ef1
parent8d6d52ae0bc823d287bc65ec7343b84d7bcad464
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic