Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

source.list

@@ -110,22 +110,19 @@ tilearea.cpp
 townname.cpp
 #if WIN32
 #else
-	#if WINCE
+	#if OS2
+		os/os2/os2.cpp
+		3rdparty/os2/getaddrinfo.c
+		3rdparty/os2/getaddrinfo.h
+		3rdparty/os2/getnameinfo.c
+		3rdparty/os2/getnameinfo.h
 	#else
-		#if OS2
-			os/os2/os2.cpp
-			3rdparty/os2/getaddrinfo.c
-			3rdparty/os2/getaddrinfo.h
-			3rdparty/os2/getnameinfo.c
-			3rdparty/os2/getnameinfo.h
+		#if OSX
+			os/macosx/crashlog_osx.cpp
 		#else
-			#if OSX
-				os/macosx/crashlog_osx.cpp
-			#else
-				os/unix/crashlog_unix.cpp
-			#end
-			os/unix/unix.cpp
+			os/unix/crashlog_unix.cpp
 		#end
+		os/unix/unix.cpp
 	#end
 #end
 vehicle.cpp
@@ -305,6 +302,8 @@ newgrf_townname.h
 news_func.h
 news_gui.h
 news_type.h
+music/midi.h
+music/midifile.hpp
 music/null_m.h
 sound/null_s.h
 video/null_v.h
@@ -1144,9 +1143,6 @@ video/null_v.cpp
 #if WIN32
 	video/win32_v.cpp
 #end
-#if WINCE
-	video/win32_v.cpp
-#end
 #end
 
 # Music
@@ -1160,22 +1156,17 @@ video/null_v.cpp
 #end
 #end
 music/null_m.cpp
+music/midifile.cpp
 #if DEDICATED
 #else
 #if WIN32
 	music/win32_m.cpp
 #else
-	#if WINCE
+	#if DOS
 	#else
-		#if PSP
+		#if MORPHOS
 		#else
-			#if DOS
-			#else
-				#if MORPHOS
-				#else
-					music/extmidi.cpp
-				#end
-			#end
+			music/extmidi.cpp
 		#end
 	#end
 #end
@@ -1229,10 +1220,6 @@ sound/null_s.cpp
 	os/windows/ottdres.rc
 	os/windows/win32.cpp
 #end
-#if WINCE
-	os/windows/ottdres.rc
-	os/windows/win32.cpp
-#end
 
 # Threading
 thread/thread.h