]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Sun, 12 Jun 2011 15:31:02 +0000 (17:31 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 12 Jun 2011 15:31:02 +0000 (17:31 +0200)
commit3cd77e9863d3c7622c1d31d1b5c3686593ff09c8
treeb4be42a460fde2e1bf5c16d7321663943cf056fe
parent0049f48c3808d0b410eaea28aee84a70a448fdca
parent5c0f2bd0a4c9bf64df16b933740a6be426bf3c99
Merge remote branch 'origin/master' into tzork/vehicles-2

Conflicts:
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/ctf.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc