From: Mircea Kitsune Date: Sat, 21 May 2011 12:15:34 +0000 (+0300) Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing X-Git-Tag: xonotic-v0.5.0~173^2~3^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e0a2fc04c5f95920d1f64a76f7f96c1e7d1f505;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/hud_postprocessing --- 6e0a2fc04c5f95920d1f64a76f7f96c1e7d1f505