Merge branch 'master' into terencehill/translate_colors_2
authorterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 13:13:44 +0000 (14:13 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 13:13:44 +0000 (14:13 +0100)
commite0e847a336cdb7ab1fcb93d3cf3e1402b761a726
tree047e36b9cfaa6c59e8201781514a975bd2340e5d
parentbb56fe5f488da2f2707876a98cc13db379c6c91b
parentc0f78e0a9c09b12e57965f31fdfccf56e5815b84
Merge branch 'master' into terencehill/translate_colors_2
qcsrc/common/teams.qh