]> de.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: 63b6be2 e95e817)
Merge branch 'master' into terencehill/min_spec_time
authorterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qh patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/client.qh
Simple merge
diff --cc qcsrc/server/mutators/events.qh
Simple merge