Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Dec 2010 11:38:08 +0000 (12:38 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Dec 2010 11:38:08 +0000 (12:38 +0100)
commit97fe16d7d3bf7c97873cc5ef52730fee817a6f72
tree72972cd1416f79b3c3f000fe30249e5334eefcf9
parent0e918e479f02465659a8863aec44d1fbb3151ae0
parenteb3ed7cf307b28b2639290537f1120a4473d5aef
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic