From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 10 May 2011 23:09:47 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96b641bfa4afe360fdecf39521aac7f6b5ed07b9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/hud_postprocessing
---

96b641bfa4afe360fdecf39521aac7f6b5ed07b9