Merge branch 'master' into terencehill/menu_optimization
authorterencehill <piuntn@gmail.com>
Sat, 5 Dec 2015 16:51:26 +0000 (17:51 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 5 Dec 2015 16:51:26 +0000 (17:51 +0100)
1  2 
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/keybinder.qc

Simple merge