]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Tue, 6 Dec 2011 16:01:04 +0000 (17:01 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 6 Dec 2011 16:01:04 +0000 (17:01 +0100)
commit6c510308d4154dabbed5388a9437ac84e897edb7
tree3570bd23e0297d6b02bd2a56f6691134cb13540c
parente8c79ab816cecd061eec17f29d0b164bcfe7b22b
parent8fe8a8dfeb0c561a14946bb7177588652e7fefe6
Merge branch 'master' into terencehill/quickmenu
defaultXonotic.cfg
keybinds.txt
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c