projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
494690b
fe96e61
)
Merge branch 'Mario/cts_killprojectiles'
author
Mario <mario@smbclan.net>
Wed, 10 Oct 2018 03:15:54 +0000
(13:15 +1000)
committer
Mario <mario@smbclan.net>
Wed, 10 Oct 2018 03:15:54 +0000
(13:15 +1000)
Trivial merge