Merge branch 'master' into terencehill/translated_keys
authorterencehill <piuntn@gmail.com>
Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)
commit45d8904a100765555e622598a39967963733df1d
tree6c54acf46bcf61ee91e0f057d6726c2725f7a3ad
parent05d2779856eda44ed6c8779ab55380fa006cfcb4
parent64c394a1bbc01e778c8ee64caf47f9d9f9a575ac
Merge branch 'master' into terencehill/translated_keys
qcsrc/client/main.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/keybinder.qc