Merge branch 'master' into terencehill/hud_fixes
authorterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 15:18:28 +0000 (16:18 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 15:18:28 +0000 (16:18 +0100)
commit6f4c7132e635c0150e3894f2f9958b361ce0c238
treed01ff72c4a39e383704941754c7de538d4946a3d
parentb58d502bc9feedd51eb1d29c6cad3f1b1f03d874
parentc0f78e0a9c09b12e57965f31fdfccf56e5815b84
Merge branch 'master' into terencehill/hud_fixes

Conflicts:
qcsrc/common/mutators/mutator/damagetext/damagetext.qc