Merge branch 'master' into terencehill/menu_optimization
authorterencehill <piuntn@gmail.com>
Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
commit7f5ad47610dc8b5580cc96ae961a57cca96e6975
treee1b0dd5cfef5affa4fec045af4adb71ada100554
parent678a61b45f332fcd560083b01e6b0bf5a5ae268c
parentf8c376b36c5dfbf2cf089c9307fa92a6341c8c67
Merge branch 'master' into terencehill/menu_optimization
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc