From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Jun 2011 08:13:40 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/new_loading_screens'
X-Git-Tag: xonotic-v0.5.0~199^2~14^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f920aea0bcef26f3e026827db1f3172606651bf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mirceakitsune/new_loading_screens'
---

4f920aea0bcef26f3e026827db1f3172606651bf