]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b0bff 6681a8e)
Merge remote-tracking branch 'origin/samual/respawn_improvements'
authorSamual Lenks <samual@xonotic.org>
Fri, 8 Feb 2013 01:44:41 +0000 (20:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 8 Feb 2013 01:44:41 +0000 (20:44 -0500)

Trivial merge