Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext

# Conflicts:
#	src/w_wad.c

src/m_argv.c

@@ -214,4 +214,4 @@ void M_FindResponseFile(void)
 
 			break;
 		}
-}
+}
\ No newline at end of file