]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/waypointeditor-auto
authormand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:24:59 +0000 (13:24 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:24:59 +0000 (13:24 -0300)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh

Simple merge
Simple merge