]> 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: bdddba5 39c6eb9)
Merge remote branch 'origin/master' into samual/runningman_separate
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 07:48:10 +0000 (02:48 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 07:48:10 +0000 (02:48 -0500)

Trivial merge