]> 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: 74a3a7c 5da6bc5)
Merge branch 'master' into terencehill/CA_forbidspawn
authorterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/command/cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/command/cmd.qc
Simple merge