Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:45:08 +0000 (17:45 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:45:08 +0000 (17:45 +0100)
commit238ea4253cb24b010aca1aee63fb33eed44c2efd
tree3cd887dc62453ea7ff8099f18ce94d80d50c342b
parent2ea181a680a001038673e27a13e1e3dd383b744e
parentd9f43c2175c35999a30c7f0838f216328da0525b
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic