From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 27 Apr 2011 22:05:31 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~11^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fb9a73bac995a188ab19e061b7ad6885760b6b8;p=xonotic%2Fxonotic-data.pk3dir.git

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

9fb9a73bac995a188ab19e061b7ad6885760b6b8