]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
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'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:35:16 +0000 (21:35 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:35:16 +0000 (21:35 +0100)

Trivial merge