Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:49:45 +0000 (15:49 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:49:45 +0000 (15:49 +0300)
commit4ea08d72371a3e1b4d62c0ebdef587fc22e9a96f
tree8bec95b4bbaf31c3d7eeba0f369cda4dbf312f16
parent801fd8197b1e453d4abb50413cd2c1014514f95a
parentef44c5f1fc1dd00a4f07f7cfcc35f6cd07c44e10
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc