Merge remote-tracking branch 'origin/mirceakitsune/sandbox'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:43:10 +0000 (16:43 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:43:10 +0000 (16:43 +0100)
commit93a42210757d659fd5b436a66c0c6cdc5eaf0a39
tree84d159575c9e2f71e8afa9ecd1f5810214800883
parent96d653c418485a1d27107dba9407b57a3d02e9fc
parent9c4f14b8fe9673393d02749d86d2da245cb02e25
Merge remote-tracking branch 'origin/mirceakitsune/sandbox'

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
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