]> 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: c4af928 bedd559)
Merge branch 'master' into develop
authorMario <mario.mario@y7mail.com>
Sun, 28 Feb 2021 08:29:47 +0000 (18:29 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 28 Feb 2021 08:29:47 +0000 (18:29 +1000)
1  2 
qcsrc/client/csqcmodel_hooks.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/common/weapons/all.qh
Simple merge