Merge branch 'master' into Mario/sound_model_paths
authorMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 06:20:09 +0000 (16:20 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Aug 2015 06:20:09 +0000 (16:20 +1000)
commitad367d1bb35b86b0ffc009d14a09e74610cb506c
tree375656e6c8bff2cc722fa502323e16a706f996b4
parentb13f0907bb1f099662521558e8af590faf4984a8
parent5d0e03ed840a2aa0a5fabb161a781d985a4bc502
Merge branch 'master' into Mario/sound_model_paths

# Conflicts:
# qcsrc/common/items/item/powerup.qc
qcsrc/common/items/item/armor.qc
qcsrc/common/items/item/health.qc
qcsrc/common/items/item/jetpack.qc
qcsrc/common/items/item/powerup.qc
qcsrc/server/t_items.qc