Merge branch 'master' into terencehill/menu_weaponarena_selection_fix
authorterencehill <piuntn@gmail.com>
Tue, 25 Aug 2015 22:25:49 +0000 (00:25 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 25 Aug 2015 22:25:49 +0000 (00:25 +0200)
commit919c48e2ad5873bf1efb041be2e23e2e60903baf
tree5821be8144333febe526fae5c5426dd1c9657090
parent492f2d61d4c2ab3d9afbf5d924eba3685c12ce8d
parent1df4fb3cec6f442b521cd1f956d47c72776ada88
Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

Conflicts:
qcsrc/menu/xonotic/radiobutton.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/radiobutton.qc