From: Sahil Singhal Date: Tue, 15 Jun 2010 19:09:19 +0000 (-0400) Subject: Merge commit 'origin/master' into diabolik/nexmodel X-Git-Tag: xonotic-v0.1.0preview~31^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=7d9981072ff2f6aa4d639503844c94a4c39d7458;hp=a970ce96fc561bd0212c2a5224361d8030451d39 Merge commit 'origin/master' into diabolik/nexmodel --- diff --git a/models/weapons/g_weapons/g_nex.blend b/models/weapons/g_weapons/g_nex.blend new file mode 100644 index 0000000..7138fe3 Binary files /dev/null and b/models/weapons/g_weapons/g_nex.blend differ diff --git a/models/weapons/v_weapons/v_nex.blend b/models/weapons/v_weapons/v_nex.blend index 88e8bbb..0a4c7d8 100644 Binary files a/models/weapons/v_weapons/v_nex.blend and b/models/weapons/v_weapons/v_nex.blend differ