projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8fb3ecf
e87123e
)
Merge branch 'Mario/target_teleporter_v2' into 'master'
author
Mario <zacjardine@y7mail.com>
Mon, 27 Nov 2017 01:29:57 +0000
(
01:29
+0000)
committer
Mario <zacjardine@y7mail.com>
Mon, 27 Nov 2017 01:29:57 +0000
(
01:29
+0000)
Merge branch Mario/target_teleporter_v2 (S merge request)
See merge request xonotic/xonotic-data.pk3dir!455
Trivial merge