projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ccbf613
1c83cb0
)
Merge remote branch 'refs/remotes/origin/fruitiex/stormkeepjumppadfix'
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:02:20 +0000
(18:02 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:02:20 +0000
(18:02 +0200)
Trivial merge