Merge branch 'martin-t/misc' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)
commitfca1fc158c44eff425d73fa279900144249aca16
treea7a0b0b4639c08cb09029687d8aadadddac24416
parent19eeff94eee19c8ed811eab52fc1a6b539c9d91b
parent2cd80c2acb7032a1a32ca524fec136f885c96960
Merge branch 'martin-t/misc' into 'master'

martin-t/misc

See merge request !399
defaultXonotic.cfg
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc