projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b8d3a3
4531117
)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
author
Rudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 18:40:08 +0000
(19:40 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Thu, 22 Dec 2011 18:40:08 +0000
(19:40 +0100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff