From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 12 Dec 2010 21:05:17 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/loadscreen'
X-Git-Tag: xonotic-v0.1.0preview~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ccb0ec591b75a8af431dcc5c9d590d1a98054a6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/loadscreen'
---

5ccb0ec591b75a8af431dcc5c9d590d1a98054a6