]> 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: c91887d d38c1f7)
Merge remote-tracking branch 'origin/master' into samual/runningman_separate
authorSamual Lenks <samual@xonotic.org>
Thu, 14 Feb 2013 21:50:33 +0000 (16:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 14 Feb 2013 21:50:33 +0000 (16:50 -0500)

Trivial merge