projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a8167f3
ecf5455
)
Merge branch 'TimePath/issues/1438,1439' into 'master'
author
Mario <zacjardine@y7mail.com>
Mon, 29 Dec 2014 00:50:51 +0000
(
00:50
+0000)
committer
Mario <zacjardine@y7mail.com>
Mon, 29 Dec 2014 00:50:51 +0000
(
00:50
+0000)
Jetpack spam
Fixes #1438 and #1439
See merge request !74
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff