projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a60cee1
71e69d6
)
Merge remote branch 'refs/remotes/origin/fruitiex/balance'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:19:49 +0000
(16:19 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:22:25 +0000
(16:22 +0100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff