From: Rudolf Polzer Date: Tue, 15 Jun 2010 09:05:17 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/morphed/uzi_texture' X-Git-Tag: xonotic-v0.1.0preview~544 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c52a7151ee8b3ab36c656dfe196cc61564b1332c;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/morphed/uzi_texture' --- c52a7151ee8b3ab36c656dfe196cc61564b1332c