]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

Simple merge
Simple merge
Simple merge
Simple merge