]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c4ae3e d78465c)
Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 03:11:39 +0000 (23:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 03:11:39 +0000 (23:11 -0400)

Trivial merge