Merge branch 'Mario/sniperrifle' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:11 +0000 (07:03 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:11 +0000 (07:03 +0000)
commita3eef12f38b05d92af8dbc1bb254ccc7565154e7
treed261a99298e1031acfc2849818264bdcab3e2e01
parentc23e397e94cb3d56d09e51dca28b733e9623093e
parent4be6b10c07af0f7c2f2379afe47301248fd718af
Merge branch 'Mario/sniperrifle' into 'master'

Merge branch Mario/sniperrifle (M merge request)

Adds new rifle model by LJFHutch

See merge request !285
scripts/weapons.shader