From: Mario Date: Thu, 18 Aug 2016 15:06:52 +0000 (+1000) Subject: Merge branch 'master' into Mario/user_movetypes X-Git-Tag: xonotic-v0.8.2~700^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9185b58da6fe5f2b095d7066577e1e024b4d2798;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/user_movetypes --- 9185b58da6fe5f2b095d7066577e1e024b4d2798