Merge branch 'master' into terencehill/tooltips_cleanup 230/head
authorterencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
commitc51698509e174e343dff48128a1dcfff1527c535
treec4a858c87b7187f336c93fedf1644602ac114d71
parent2cbe50a41fcd237cdc76136a22842c18e739cbcc
parente16d25dcdc69475349fc6d03405e32b8748f95cb
Merge branch 'master' into terencehill/tooltips_cleanup
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc