]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitbd39f7688ab0c31e7d598ea928559ada88524449
tree86d4487f8cb6f6e8dc922cca2db8c2e03264ff6e
parent81ee33bce03b69ff85220295ce4adc9b0ccfa996
parent16d1fe1b83453c783d48c564fab0758f03592c71
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc