]> 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: 0280360 63de121)
Merge branch 'Mario/cts_respawn_clear' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 16 May 2017 22:15:33 +0000 (22:15 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 16 May 2017 22:15:33 +0000 (22:15 +0000)
Merge branch Mario/cts_respawn_clear (S merge request)

See merge request !432

1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/player.qc
Simple merge