]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c23e397 4be6b10)
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)
Merge branch Mario/sniperrifle (M merge request)

Adds new rifle model by LJFHutch

See merge request !285

1  2 
scripts/weapons.shader patch | diff1 | diff2 | blob | history

diff --cc scripts/weapons.shader
Simple merge