projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7696e6f
1d6afe4
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 10:44:24 +0000
(12:44 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 10:44:24 +0000
(12:44 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff