projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cb15762
dc43179
)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:04:29 +0000
(07:04 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:04:29 +0000
(07:04 +0100)
Trivial merge