]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 5790b9e)
Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:36:15 +0000 (10:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:36:15 +0000 (10:36 +0200)
models/weapons/g_weapons/g_nex.blend [new file with mode: 0644] patch | blob
models/weapons/h_weapons/blend/h_nex.blend patch | blob | history
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..6188e9f
Binary files /dev/null and b/models/weapons/g_weapons/g_nex.blend differ
diff --git a/models/weapons/h_weapons/blend/h_nex.blend b/models/weapons/h_weapons/blend/h_nex.blend
index 0084381bdbd5d5aac63d71d434e42d22ad89c245..8315e6bb5fbe0e720f20b488ddb27302004520e0 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_nex.blend and b/models/weapons/h_weapons/blend/h_nex.blend differ
diff --git a/models/weapons/v_weapons/v_nex.blend b/models/weapons/v_weapons/v_nex.blend
index 88e8bbbe4aeede7d5df3a9a4eb65975d219405f8..46878eb064f295b131e2e516379a16db00000e4f 100644 (file)
Binary files a/models/weapons/v_weapons/v_nex.blend and b/models/weapons/v_weapons/v_nex.blend differ