]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 15:55:30 +0000 (11:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 15:55:30 +0000 (11:55 -0400)
commitf0e4cbdeab56f82814323397131337b5cbc312e0
treefd751327e981c5b9ee7745334bcc05bec86c40da
parent5cfe22a6d2dafe5732cf558da63ca5333cdd58ca
parentcf26ba11220f6f3d6280c26040ad311ee92ebeb2
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc