]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a970ce9)
Merge commit 'origin/master' into diabolik/nexmodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 15 Jun 2010 19:09:19 +0000 (15:09 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 15 Jun 2010 19:09:19 +0000 (15:09 -0400)
models/weapons/g_weapons/g_nex.blend [new file with mode: 0644] patch | blob
models/weapons/v_weapons/v_nex.blend patch | blob | history

diff --git a/models/weapons/g_weapons/g_nex.blend b/models/weapons/g_weapons/g_nex.blend
new file mode 100644 (file)
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 88e8bbbe4aeede7d5df3a9a4eb65975d219405f8..0a4c7d8c5f6cb1d67fe42d3883f854bb59c1d26f 100644 (file)
Binary files a/models/weapons/v_weapons/v_nex.blend and b/models/weapons/v_weapons/v_nex.blend differ