projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1c674a
be06a03
)
Merge branch 'master' into Mario/csqc_muzzleflash
author
Mario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 18:48:30 +0000
(
04:48
+1000)
committer
Mario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 18:48:30 +0000
(
04:48
+1000)
1
2
qcsrc/common/weapons/all.qh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/weapons/all.qh
Simple merge