projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87d4a81
258fca0
)
Merge remote branch 'origin/terencehill/megaerebus_centered'
author
Samual <samual@xonotic.org>
Sun, 26 Feb 2012 01:23:51 +0000
(20:23 -0500)
committer
Samual <samual@xonotic.org>
Sun, 26 Feb 2012 01:23:51 +0000
(20:23 -0500)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff