From: Rudolf Polzer Date: Sat, 25 Sep 2010 11:17:32 +0000 (+0200) Subject: Merge branch 'master' into fruitiex/epsilon X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=794d87d72956446cb48af82e2730bd3f82ad2502;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into fruitiex/epsilon Conflicts: models/xonotic_jumppad01/xonotic_jumppad01.md3_0.skin models/xonotic_jumppad01/xonotic_jumppad01.md3_1.skin models/xonotic_jumppad01/xonotic_launchpad01.md3_0.skin models/xonotic_jumppad01/xonotic_launchpad01.md3_1.skin --- 794d87d72956446cb48af82e2730bd3f82ad2502