projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
220b53b
ec02f49
)
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
author
Rudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:49:59 +0000
(11:49 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:49:59 +0000
(11:49 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff