]> de.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>
Wed, 1 Jun 2011 16:40:20 +0000 (18:40 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 1 Jun 2011 16:40:20 +0000 (18:40 +0200)
commitd1ae740c1d4fb251c89164056373b5d86888c1b7
tree4b3701cac47eff502cd30d55db76cfa7f55e48ba
parentc0cf8ad9cbf5b19ede642920d1cb63df61fe0461
parentccb58bb7bd62f64a64ed18232d7b0ab475816939
Merge remote branch 'origin/master' into tzork/vehicles-2

Conflicts:
qcsrc/client/View.qc
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/vehicles/raptor.qc