]> 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 | compact (merge: 589249c 5030f79)
Merge remote-tracking branch 'origin/master' into Mirio/silentsiege
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:47:53 +0000 (12:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 16:47:53 +0000 (12:47 -0400)

Trivial merge