]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19eeff9 2cd80c2)
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)
martin-t/misc

See merge request !399

1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator/gamemode_ctf.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge