Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 12:11:18 +0000 (14:11 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 12:11:18 +0000 (14:11 +0200)
commitf3cd6e8e994c399d573bf829b43ef04efb6d1a67
treee9a42ebd18855d9a494da2d2e06676ae68d54daf
parent40c2c18b6b45aa15018aab02fdd36067fa7e776c
parentb9fd32ef1ba5d146799fe22184e0a9e77dc49dc2
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir