]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Mon, 16 May 2011 17:38:53 +0000 (13:38 -0400)
committerSamual <samual@xonotic.org>
Mon, 16 May 2011 17:38:53 +0000 (13:38 -0400)
commitad2a02870d321031343f94bee328392c7156bafb
tree238e2bff7b54e1eb7273d3d54dbbc7dcc4c1a58a
parent101207b33a08ec67ab066e611c276d22900c01b7
parent39773019f9c42a94e91ec8e1225445a9c7b1736b
Merge remote branch 'origin/master' into samual/flyingspectators
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh