Merge branch 'master' into Mario/wrath-darkplaces_extra

diff --cc cl_input.c
Simple merge

diff --cc cl_parse.c
Simple merge

diff --cc cl_particles.c
Simple merge

diff --cc cl_screen.c
Simple merge

diff --cc client.h
Simple merge

diff --cc clvm_cmds.c
Simple merge

diff --cc cmd.c
Simple merge

diff --cc common.h
Simple merge

diff --cc draw.h
Simple merge

diff --cc fs.c
Simple merge

diff --cc fs.h
index 4bcca8a27277fa18a965997122bdfe35ca792c73,b8ada8b990b831b04c55441845e96958da262d59..4f85fb48a9ca5f24737f4d54c9277bb3500d4f57
--- 1/fs.h
--- 2/fs.h
+++ b/fs.h
@@@ -85,7 -85,7 +85,8 @@@ void FS_Purge (qfile_t* file)
  const char *FS_FileWithoutPath (const char *in);
  const char *FS_FileExtension (const char *in);
  int FS_CheckNastyPath (const char *path, qbool isgamedir);
 +int FS_rmtree(const char *dir);
+ void FS_SanitizePath (char *path);
  
  extern const char *const fs_checkgamedir_missing; // "(missing)"
  const char *FS_CheckGameDir(const char *gamedir); // returns NULL if nasty, fs_checkgamedir_missing (exact pointer) if missing

diff --cc gl_draw.c
Simple merge

diff --cc gl_rmain.c
Simple merge

diff --cc keys.c
Simple merge

diff --cc makefile.inc
Simple merge

diff --cc menu.c
Simple merge

diff --cc mvm_cmds.c
Simple merge

diff --cc prvm_cmds.c
Simple merge

diff --cc prvm_cmds.h
Simple merge

diff --cc sv_main.c
Simple merge

diff --cc svvm_cmds.c
Simple merge

diff --cc vid_shared.c
Simple merge