]> 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: d38c1f7 def0fbf)
Merge remote-tracking branch 'origin/samual/runningman_separate'
authorSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 17:11:30 +0000 (12:11 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 3 Mar 2013 17:11:30 +0000 (12:11 -0500)

Trivial merge