projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5345a90
6ba4eb8
)
Merge branch 'xonotic-maps.pk3dir/itsme/vorix' of git://git.xonotic.org/xonotic/oldst...
author
ItsMe <itsme.xonotic@ymail.com>
Thu, 20 Jun 2013 07:37:25 +0000
(09:37 +0200)
committer
ItsMe <itsme.xonotic@ymail.com>
Thu, 20 Jun 2013 07:37:25 +0000
(09:37 +0200)
Trivial merge