]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit63ab06764e6e0a20481ab406863eb7bca32cb669
treeee5c7343ba5a78bdcd96e7195ddbb91ad49bd374
parent0280360295b357680a97a795b9088b5f1a89d13d
parent63de1215428d078d5fb2021c49edf59a7900cef9
Merge branch 'Mario/cts_respawn_clear' into 'master'

Merge branch Mario/cts_respawn_clear (S merge request)

See merge request !432
qcsrc/server/client.qc
qcsrc/server/player.qc