]> 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: 0183617 f862510)
Merge remote-tracking branch 'origin/Mirio/mapoptions'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)

Trivial merge