]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
Merge commit 'origin/master' into diabolik/sourceforplayers
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 3 Jun 2010 19:12:26 +0000 (15:12 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 3 Jun 2010 19:12:26 +0000 (15:12 -0400)
models/weapons/v_weapons/v_hookgun.blend
models/weapons/v_weapons/v_laser.blend
models/weapons/v_weapons/v_porto.blend

index 8960f85248f1a5b12a6212d45e42aa8e414c6dc4..911ad23dbf36200b8df49e4a7b5d63e9dbf1daee 100644 (file)
Binary files a/models/weapons/v_weapons/v_hookgun.blend and b/models/weapons/v_weapons/v_hookgun.blend differ
index e8157ff77eaad025c8ed92993fefd9ec2363aa53..d11597e181b9c1caa4a364b5fba4e4862f99b4e7 100644 (file)
Binary files a/models/weapons/v_weapons/v_laser.blend and b/models/weapons/v_weapons/v_laser.blend differ
index 2907c08ec2e56a7941bb5abaf4bf7db7368ad6ba..fbebdb9b0bbb889d06787af8ce4b344e5e65048e 100644 (file)
Binary files a/models/weapons/v_weapons/v_porto.blend and b/models/weapons/v_weapons/v_porto.blend differ