]> 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: ef699c7 0bb8d57)
Merge branch 'TimePath/issues/1434' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 25 Dec 2014 10:31:34 +0000 (10:31 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 25 Dec 2014 10:31:34 +0000 (10:31 +0000)
Fix broken reloadable weapons (and somehow players using random models)

See issue #1434

See merge request !65


Trivial merge