]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 28 Oct 2011 12:22:43 +0000 (15:22 +0300)
commit89eff022dd8653e6b5965d35dd9fb9caa54fe72c
treeecff58499882d7f4c68134071e743ab8b5baa5a8
parente0476eb3bfb77d9a48d2d3bddd563d149a8ce4bf
parent1206c2b84ba71de422578cb5d3d8a41027ab131a
Merge branch 'master' into mirceakitsune/sandbox
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc