]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38b5218 53ae9c7)
Merge remote-tracking branch 'origin/mirceakitsune/red_planet'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 22 May 2011 18:01:04 +0000 (20:01 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 22 May 2011 18:01:04 +0000 (20:01 +0200)

Trivial merge