From: Mirio Date: Fri, 6 Mar 2015 21:40:18 +0000 (+0100) Subject: Merge branch 'master' into debugger/shadow/atelier X-Git-Tag: xonotic-v0.8.1~9^2~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45fd07a2aadfaffa146a6661a4bdf5bbd36c5f4e;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into debugger/shadow/atelier --- 45fd07a2aadfaffa146a6661a4bdf5bbd36c5f4e