From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 14 Mar 2011 13:45:26 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71b2295b8ed7e2d9a5785467e8d9f65b69494b89;p=xonotic%2Fxonotic-data.pk3dir.git

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

71b2295b8ed7e2d9a5785467e8d9f65b69494b89