]> 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: 5c4e019 6477b06)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 12 Jun 2018 05:24:17 +0000 (15:24 +1000)
committerMario <mario@smbclan.net>
Tue, 12 Jun 2018 05:24:17 +0000 (15:24 +1000)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history
qcsrc/client/weapons/projectile.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge
diff --cc qcsrc/client/weapons/projectile.qc
Simple merge