projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbc64f9
432b6c9
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
author
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 10:05:56 +0000
(13:05 +0300)
committer
FruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 10:05:56 +0000
(13:05 +0300)
Trivial merge