]> 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: ce80a3d 64c74c4)
Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Sat, 12 Dec 2020 16:58:08 +0000 (17:58 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 12 Dec 2020 16:58:08 +0000 (17:58 +0100)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history
qcsrc/client/weapons/projectile.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/weapons/all.qh
Simple merge