From: Mirio Date: Thu, 9 Jul 2015 19:10:24 +0000 (+0200) Subject: Merge branch 'master' into debugger/shadow/atelier X-Git-Tag: xonotic-v0.8.1~9^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f1648036b67cc9cda17bdcf5fe52d00cda521d6c;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into debugger/shadow/atelier --- f1648036b67cc9cda17bdcf5fe52d00cda521d6c