projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0a6ce09
978a570
)
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000
(10:31 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000
(10:31 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff