Merge branch 'master' into crashlog_improvements

# Conflicts: # src/console_cmds.cpp # src/openttd.cpp # src/vehicle.cpp
2018-07-26 20:01:08 +01:00
parent ddef3ad7c2 bf8d7df736
commit 9490f33a6c
315 changed files with 9395 additions and 2892 deletions
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -308,9 +308,7 @@ bool GetClipboardContents(char *buffer, const char *last)

 void CSleep(int milliseconds)
 {
-	#if defined(PSP)
-		sceKernelDelayThread(milliseconds * 1000);
-	#elif defined(__BEOS__)
+	#if defined(__BEOS__)
 		snooze(milliseconds * 1000);
 	#elif defined(__AMIGA__)
 	{