Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic xonotic-v0.5.0
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 5 Sep 2011 11:09:24 +0000 (13:09 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 5 Sep 2011 11:09:24 +0000 (13:09 +0200)
commit5b4307c6a17aac239095030c527fbc76f1a0cf23
tree43f17cd23fb3b9879a0acf9cd4804373f4a3caa8
parentd6c83468003ff63241b3fcd53c7a64fe814bb0bc
parent433d27100a4c5a3c282f7b552b2f7cf60f2446ee
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic