projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ed0476 bfce4a2)
Merge branch 'master' into terencehill/glowmod_color_fix
authorMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:22:49 +0000 (08:22 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 22:22:49 +0000 (08:22 +1000)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history
qcsrc/client/weapons/projectile.qc patch | diff1 | diff2 | blob | history
qcsrc/common/turrets/cl_turrets.qc patch | diff1 | diff2 | blob | history
qcsrc/common/weapons/all.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge
diff --cc qcsrc/client/weapons/projectile.qc
Simple merge
diff --cc qcsrc/common/turrets/cl_turrets.qc
Simple merge
diff --cc qcsrc/common/weapons/all.qh
Simple merge