]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:33:17 +0000 (00:33 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:33:17 +0000 (00:33 +0100)
commitf2112ed6b7792c44ed5d9568ba8f20aad6885aff
treeacc1a0dd7952ee84d10db83c9e2cca6c3b394607
parentc517744f3a3b880912ac77283dc20cde240e73a7
parent87bcf91b0bb31ca5292d26e18026b628db6185fa
Merge branch 'master' into terencehill/quickmenu
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh