projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
606abbf
839fc45
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
author
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 09:22:08 +0000
(12:22 +0300)
committer
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 09:22:08 +0000
(12:22 +0300)
Trivial merge