From: Rudolf Polzer Date: Tue, 30 Nov 2010 14:14:02 +0000 (+0100) Subject: Merge remote branch 'origin/morphed/minelayer' X-Git-Tag: xonotic-v0.1.0preview~86^2~6 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=43e505de8b1da79c86378b8d58c1bfb071fc8cb7;hp=83f3093274f9d4886f845964d4ae5763b6c7bb78 Merge remote branch 'origin/morphed/minelayer' --- diff --git a/models/weapons/g_minelayer.md3 b/models/weapons/g_minelayer.md3 index 5fce1ef25..898c13233 100644 Binary files a/models/weapons/g_minelayer.md3 and b/models/weapons/g_minelayer.md3 differ diff --git a/models/weapons/v_minelayer.md3 b/models/weapons/v_minelayer.md3 index 4c7d4498f..529f02fcf 100644 Binary files a/models/weapons/v_minelayer.md3 and b/models/weapons/v_minelayer.md3 differ diff --git a/textures/minelayer.tga b/textures/minelayer.tga new file mode 100644 index 000000000..e0fa48c14 Binary files /dev/null and b/textures/minelayer.tga differ diff --git a/textures/minelayer_gloss.tga b/textures/minelayer_gloss.tga new file mode 100644 index 000000000..2ca8b9a45 Binary files /dev/null and b/textures/minelayer_gloss.tga differ diff --git a/textures/minelayer_glow.tga b/textures/minelayer_glow.tga new file mode 100644 index 000000000..163735f7f Binary files /dev/null and b/textures/minelayer_glow.tga differ