Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Nov 2011 14:21:04 +0000 (16:21 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Nov 2011 14:21:04 +0000 (16:21 +0200)
commit6f6a9d3ce8a4fd3c10f7421ba27e4bfc944c8f9b
tree9c136d5c29c6cf4c2efbb037e9fbf775c07dff85
parent2976326817cdd461dcfa0fdbcb58d3413687451b
parent966ecd5b871fc8ef6db7665c08bd17971a8830db
Merge branch 'master' into mirceakitsune/sandbox
defaultXonotic.cfg
effectinfo.txt
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc