]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: bf001fc)
Merge branch 'master' into mirceakitsune/shotgun_cannon
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Nov 2011 00:17:16 +0000 (02:17 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Nov 2011 00:17:16 +0000 (02:17 +0200)
models/weapons/g_weapons/g_shotgun.blend [new file with mode: 0644] patch | blob
models/weapons/h_weapons/blend/h_shotgun.blend patch | blob | history
models/weapons/v_weapons/v_shotgun.blend patch | blob | history

diff --git a/models/weapons/g_weapons/g_shotgun.blend b/models/weapons/g_weapons/g_shotgun.blend
new file mode 100644 (file)
index 0000000..35751fa
Binary files /dev/null and b/models/weapons/g_weapons/g_shotgun.blend differ
diff --git a/models/weapons/h_weapons/blend/h_shotgun.blend b/models/weapons/h_weapons/blend/h_shotgun.blend
index 8cad239f6544a77e067454b6c69cb27dd48f559f..2c24bffd478ab0fa897802d849ee78ee73f9209b 100644 (file)
Binary files a/models/weapons/h_weapons/blend/h_shotgun.blend and b/models/weapons/h_weapons/blend/h_shotgun.blend differ
diff --git a/models/weapons/v_weapons/v_shotgun.blend b/models/weapons/v_weapons/v_shotgun.blend
index b28a26620427674bfe8788d6bd883e8cfad09928..3e3c029678bf8da12b305dd127e32b4593e10e14 100644 (file)
Binary files a/models/weapons/v_weapons/v_shotgun.blend and b/models/weapons/v_weapons/v_shotgun.blend differ