From: Mircea Kitsune Date: Mon, 17 Sep 2012 23:00:49 +0000 (+0300) Subject: Merge branch 'master' into mirceakitsune/player_cubemaps X-Git-Tag: xonotic-v0.8.0~89^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8462cdfd7d8ed7880c1f0536b1b4c354ed81d70;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/player_cubemaps --- d8462cdfd7d8ed7880c1f0536b1b4c354ed81d70