Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 14:25:47 +0000 (15:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 14:25:47 +0000 (15:25 +0100)
commit2a894757eae152b20734b24a2f9faed3fb656440
tree97251b4e90f89eaac38b89bcee5044b634ead888
parent9b441a9dfce6e11f199068652c5d6fb9b889cae0
parentaadc7ce360f266135da544f7c10c62fffd6f8162
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir