Merge branch 'master' into terencehill/scoreboard_panel_2
authorterencehill <piuntn@gmail.com>
Wed, 10 Aug 2016 13:40:54 +0000 (15:40 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 10 Aug 2016 13:40:54 +0000 (15:40 +0200)
commit6585b5a8ef2ce4ee66826df826a6c759bd815cb8
treea16c5334ac0f038f068d6a0c6563dce52efc719f
parentcd12fdabbd62dd69f2378f971c0653ac8a3c6bc6
parentb6d22ea672a1e0b7924a8ac804933a90ea7baabd
Merge branch 'master' into terencehill/scoreboard_panel_2
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc