Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)
commitb0259aa7cd71ac09094e96c4986318ae476f3180
treed239269f55db2ebba8a350e70b1cfaa8935093dd
parent0a6ce0928d11c81f66a7d3b63d2e6375169b6f47
parent978a57087bf24f7722f1bfce59402c8a49fa91cf
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'