projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4a0a5e
dd82b2e
)
Merge branch 'Mirio/credits' into 'master'
author
Mario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:31:40 +0000
(
05:31
+0000)
committer
Mario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:31:40 +0000
(
05:31
+0000)
Mirio/credits
Somehow CuBe0wL got lost
See merge request !92
Trivial merge