]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit71ce27cd515d7e8157535466ef357f83253b64f0
tree6fb9b5f555fd685bcee08080fb812ad13386d4f2
parent7d6db6a932fdfde0f69e8aede503b845904ec71a
parent2c2c6512bd90d0946077fb61911fa6021c5f0cf1
Merge branch 'master' into terencehill/menu_optimization
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/keybinder.qc