]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Sat, 21 Jul 2012 19:16:23 +0000 (15:16 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 21 Jul 2012 19:16:23 +0000 (15:16 -0400)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc

Simple merge
Simple merge
Simple merge
Simple merge