]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfb35b2ef26f19566e686f90d71f0b5a59af7ab53
treed0960fa3b18365d61c9c17e5d124c3fd137090ae
parentf6f580a132e6aaf334eb771f72bb5a99c9f87134
parent11b0bff52b9e56b9ae41469588d61b7a8da4c3b8
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements