]> 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: bd21a41 1ce1c9c)
Merge branch 'Mario/headshots' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:22:55 +0000 (03:22 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:22:55 +0000 (03:22 +0000)
Merge branch Mario/headshots (S merge request)

See merge request xonotic/xonotic-data.pk3dir!839

1  2 
qcsrc/server/miscfunctions.qh patch | diff1 | diff2 | blob | history
qcsrc/server/weapons/tracing.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/miscfunctions.qh
Simple merge
diff --cc qcsrc/server/weapons/tracing.qc
Simple merge