]> 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: 50c05a6 627f44c)
Merge remote-tracking branch 'origin/Mario/red-planet_nuke'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 17 Jun 2014 14:01:36 +0000 (16:01 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 17 Jun 2014 14:01:36 +0000 (16:01 +0200)
* origin/Mario/red-planet_nuke:
  Remove red-planet


Trivial merge