From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 26 Sep 2010 16:45:48 +0000 (+0200)
Subject: Merge branch 'morphed/armor'
X-Git-Tag: xonotic-v0.1.0preview~310^2~7^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d1ef0e823b34950a422fc383b550db41c1de74d9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'morphed/armor'
---

d1ef0e823b34950a422fc383b550db41c1de74d9