Merge remote branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Thu, 26 May 2011 17:26:56 +0000 (19:26 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 26 May 2011 17:26:56 +0000 (19:26 +0200)
commit5be16497ca10373f33c220f727d88439277352ce
tree45b819677bb03d4d8d49772a138e3ac3cf5900b1
parent24eeef3b4f9c897ed5cfcdf3753f937e46810ce7
parent1ed620d16c68ee54ca7c97688b07932265c343dc
Merge remote branch 'origin/master' into tzork/vehicles-2
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc