]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/menu/xonotic/keybinder.qc

Simple merge