]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 16:00:08 +0000 (17:00 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 16:00:08 +0000 (17:00 +0100)
commitd53800a81ad1253e6ee6eca8b9971bbf275df7ee
tree0ecb110cdb5dd6d5ca2a018a22404952431f07f2
parent69ce389c2d8428de35bc392b7aa38b121632ca6c
parent12e90348bf3dcdf2feb0753b440f050e23abfb6b
Merge branch 'master' into divVerent/csqcmodel
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cheats.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src