Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:02:46 +0000 (20:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:02:46 +0000 (20:02 +0100)
commit741374320788099618aba0ea1ee041e614ec3d75
tree40c1570d38e4c99938da01d4be057c1f86282d61
parent898360db2c4abcce2d2f17e651bb62548f048da5
parent970e6c1454dd92c2fd71b4869abd3a471ba68eea
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir