projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd74a05
c7b9e53
)
Merge remote branch 'origin/mirceakitsune/red_planet'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:35:16 +0000
(21:35 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:35:16 +0000
(21:35 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff