Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:17:19 +0000 (16:17 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:17:19 +0000 (16:17 +0100)
commit96d653c418485a1d27107dba9407b57a3d02e9fc
treec56843bab53c82171055429e77d7d452dcd26be6
parentb99ef4e8c29dfc69eb2fd98f12802f8616f1dcd5
parent501af1652a5d6f71d6b4d36f36f22dfaf700f4a8
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir