]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d31697 b6b68fa)
Merge branch 'master' into Mario/cts_respawn_clear
authorMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:22:54 +0000 (07:22 +1000)
committerMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:22:54 +0000 (07:22 +1000)
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