]> 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: f6f580a 11b0bff)
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
authorSamual Lenks <samual@xonotic.org>
Thu, 7 Feb 2013 22:44:28 +0000 (17:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 7 Feb 2013 22:44:28 +0000 (17:44 -0500)

Trivial merge