Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 22:17:40 +0000 (00:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 22:17:40 +0000 (00:17 +0200)
commitc045b87696a4fb7c1537b058cafaef23213c35bc
tree694b191a49500dc06bbb9184e503ae01013b1335
parent90ddfe01783664be39f83c730cbbec92c5756014
parentec26b985c6cee2bde97ecaacb98a37323272baf2
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir