Merge branch 'master' into mirceakitsune/universal_reload_system, with some VERY...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 2 Mar 2011 22:19:06 +0000 (00:19 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 2 Mar 2011 22:19:06 +0000 (00:19 +0200)
commitf2671ce82866c2468c1fa315101d30f91af2adbb
treec3e71e9b932e3baba90a8105a8a081a46b6a2dec
parent9916365c2cb451fed25823246c19385c1e1eb726
parent44e7b9d6058eef0fa6612930ef5d57dd6df1ca77
Merge branch 'master' into mirceakitsune/universal_reload_system, with some VERY conflicting changes. This is why I have waiting a long time for a branch to get merged in 
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/w_minelayer.qc