From: Rudolf Polzer Date: Thu, 21 Oct 2010 11:29:57 +0000 (+0200) Subject: Merge branch 'master' into fruitiex/runningmanctf X-Git-Tag: xonotic-v0.5.0~129^2~46 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75430885ab8f5f9a5734bef72cee97c7664d2a95;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into fruitiex/runningmanctf Conflicts: sound/wind/WindDesert-Loop.wav sounds/wind/WindDesert-Loop.WAV sounds/wind/WindDesert-Loop.wav --- 75430885ab8f5f9a5734bef72cee97c7664d2a95