]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 368a6f8 4557ec2)
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 30 Jun 2022 23:16:03 +0000 (01:16 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 30 Jun 2022 23:16:03 +0000 (01:16 +0200)
1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/common/turrets/sv_turrets.qc patch | diff1 | diff2 | blob | history
qcsrc/common/turrets/sv_turrets.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/common/turrets/sv_turrets.qc
Simple merge
diff --cc qcsrc/common/turrets/sv_turrets.qh
Simple merge