projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
0cd2ba9
b737b88
)
Merge remote branch 'origin/diabolik/weaponscale'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 19 May 2010 13:44:52 +0000
(15:44 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 19 May 2010 13:44:52 +0000
(15:44 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff