From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 16 May 2010 19:05:11 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource'
X-Git-Tag: xonotic-v0.1.0preview~58
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=36ae563f0141643bdba1797816d4090cc5fa5aab;hp=cb708cb69c3422064008c347231f8f7df2b0312b

Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource'
---

diff --git a/models/player/pyria.blend b/models/player/pyria.blend
new file mode 100644
index 0000000..ebd9125
Binary files /dev/null and b/models/player/pyria.blend differ
diff --git a/models/player/umbra.blend b/models/player/umbra.blend
new file mode 100644
index 0000000..dfae3ce
Binary files /dev/null and b/models/player/umbra.blend differ