]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/quickmenu_UPDATE
authorterencehill <piuntn@gmail.com>
Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 21 Jan 2014 00:26:17 +0000 (01:26 +0100)
commit20dab29dead5d1060ed27d11b7a7dc1ff42ab1b4
tree1f3a7709f72912dffe33a998bc9bf437c24070ce
parentf9636c064982003191aa922897ad18fd5645248e
parent4ca3da8388a8ce9499734b598d915a91f7ed7115
Merge branch 'master' into terencehill/quickmenu_UPDATE
common.it.po
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c