From: Mario Date: Sat, 13 Dec 2014 23:52:41 +0000 (+1100) Subject: Merge branch 'master' into mirceakitsune/player_cubemaps X-Git-Tag: xonotic-v0.8.0~89^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f3709f96ff607455d69dc4844e39a8ea0587675;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/player_cubemaps --- 0f3709f96ff607455d69dc4844e39a8ea0587675