From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 26 Sep 2010 13:45:00 +0000 (+0200)
Subject: Merge remote branch 'origin/tzork/shadescript'
X-Git-Tag: xonotic-v0.1.0preview~187
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=84c897e857cb94ab75672ba9e295ca0ff47cc713

Merge remote branch 'origin/tzork/shadescript'
---

84c897e857cb94ab75672ba9e295ca0ff47cc713