projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
615bb68
f05fed1
)
Merge branch 'Mario/buffs'
author
Mario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000
(22:07 +1100)
committer
Mario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000
(22:07 +1100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff