From: Rudolf Polzer Date: Thu, 24 May 2012 08:41:01 +0000 (+0200) Subject: Merge branch 'master' into mirceakitsune/func_train_beizer_curve X-Git-Tag: xonotic-v0.8.0~295^2~30 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5762f1767145d4c69961d71f4a668c213b1948c7;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/func_train_beizer_curve --- 5762f1767145d4c69961d71f4a668c213b1948c7