]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Fri, 1 Jun 2012 20:10:43 +0000 (22:10 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Fri, 1 Jun 2012 20:10:43 +0000 (22:10 +0200)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh

Simple merge
Simple merge