]> 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: 8195ee4 774440a)
Merge branch 'master' into Mario/arc_bolt_bounce
authorMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 05:55:56 +0000 (15:55 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 05:55:56 +0000 (15:55 +1000)
1  2 
qcsrc/client/weapons/projectile.qc patch | diff1 | diff2 | blob | history
qcsrc/common/weapons/weapon/arc.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/weapons/projectile.qc
Simple merge
diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge