Merge branch 'console-improvements' of http://git.magicalgirl.moe/STJr/SRB2 into console-improvements

# Conflicts:
#	src/sdl/i_system.c

src/win32/win_sys.c

@@ -3605,7 +3605,7 @@ INT32 I_ClipboardCopy(const char *data, size_t size)
 	return -1;
 }
 
-char *I_ClipboardPaste(void)
+const char *I_ClipboardPaste(void)
 {
 	return NULL;
 }