Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 19:33:30 +0000 (21:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 19:33:30 +0000 (21:33 +0200)
commit7ca04525144b6d7c3c89bdac75cb4a239823ae6f
tree3f116477886a99d6376678f1a5de172625a81108
parent4278e9e08c13b99a60fb88ae4197add85e978ac2
parent82f7254763ff085750f7b69a59c84de87e13da03
Merge branch 'master' of ssh://git.xonotic.org/xonotic