From: Rudolf Polzer Date: Wed, 4 Aug 2010 11:58:50 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance' X-Git-Tag: xonotic-v0.1.0preview~25 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=9c8cfdcd338775ea901bd06713d096c5828a3bc1;hp=ad0f3c41b1050c20904c73cafce92d8ffefbe296 Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance' --- diff --git a/models/weapons/h_weapons/blend/h_shotgun.blend b/models/weapons/h_weapons/blend/h_shotgun.blend index 6225837..8cad239 100644 Binary files a/models/weapons/h_weapons/blend/h_shotgun.blend and b/models/weapons/h_weapons/blend/h_shotgun.blend differ