]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 4 Dec 2011 15:26:04 +0000 (17:26 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 4 Dec 2011 15:26:04 +0000 (17:26 +0200)
commit6fefb38d7618ba85d7ec2484d18231a76373f313
tree284be3836832b49c39e56ae57138ca79493f0e3f
parent9c4f14b8fe9673393d02749d86d2da245cb02e25
parent96d653c418485a1d27107dba9407b57a3d02e9fc
Merge branch 'master' into mirceakitsune/sandbox
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc