Merge branch 'master' into terencehill/menu_optimization
authorterencehill <piuntn@gmail.com>
Sun, 13 Dec 2015 23:51:54 +0000 (00:51 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Dec 2015 23:51:54 +0000 (00:51 +0100)
commit678a61b45f332fcd560083b01e6b0bf5a5ae268c
tree2f9ed97a15d7ec0538d631c888c7603c99e20425
parentf7a6ca3ada0e768b2697ff300887f0019a496f63
parent278c051f3e12cc972ea8b9b7eb8ad8c09b4947cd
Merge branch 'master' into terencehill/menu_optimization
qcsrc/menu/xonotic/keybinder.qc