Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)
commit1b2c9a2d1c8380ec613fc007e098eb7634204e00
treea0b63789b7240ef91ec448e1e0fb47d5797adaf0
parentd5461ef16f4b64ba784d3a29ee9b1b54a1e7dba3
parent2d519778eb3d0ef03ef17101b55bd4ebb81c0f03
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic