Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000 (17:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000 (17:30 +0200)
commit46fb2154dc0d032f0704d56d9c7f9dbbadff38aa
tree3e3d131c68a8537287a972c7ae79edc56af46484
parent955bb976423e7bd74eba8ec2c2e45c9384a43ae7
parentc4d03be2e9c0c7089b924a1d533b23532f380939
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic