Merge branch 'master' into divVerent/anticheat-tricks

diff --cc cl_demo.c
Simple merge

diff --cc cl_parse.c
Simple merge

diff --cc cmd.c
Simple merge

diff --cc console.c
Simple merge

diff --cc fs.c
Simple merge

diff --cc host.c
Simple merge

diff --cc host_cmd.c
Simple merge

diff --cc netconn.c
Simple merge

diff --cc vid_glx.c
Simple merge

diff --cc vid_sdl.c
Simple merge

diff --cc vid_wgl.c
Simple merge