]> 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, 9 May 2013 20:57:46 +0000 (16:57 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:57:46 +0000 (16:57 -0400)
commitd0b85ebad8d5e857da325eb4fc948d401d725e3b
treefff71824a8f87e8b9043e26952462629fb9ac497
parent2af5efacd03d896e219b17e868b879c63cd6e77a
parentc378ad38aeb4fadbdd0125f3242837bdcf688494
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc