]> 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: 09537df d38c1f7)
Merge remote-tracking branch 'origin/master' into kuniuthefrogg/abyss
authorSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 09:21:14 +0000 (04:21 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 09:21:14 +0000 (04:21 -0500)

Trivial merge