Merge branch 'master' into cpp-11

# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/saveload/saveload.cpp

source.list

@@ -95,22 +95,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
@@ -196,6 +193,7 @@ fileio_type.h
 fios.h
 fontcache.h
 fontdetection.h
+framerate_type.h
 base_consist.h
 gamelog.h
 gamelog_internal.h
@@ -284,6 +282,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
@@ -345,6 +345,7 @@ strgen/strgen.h
 string_base.h
 string_func.h
 string_type.h
+os/windows/string_uniscribe.h
 stringfilter_type.h
 strings_func.h
 strings_type.h
@@ -398,6 +399,7 @@ video/win32_v.h
 window_func.h
 window_gui.h
 window_type.h
+sound/xaudio2_s.h
 zoom_func.h
 zoom_type.h
 #if WIN32
@@ -406,11 +408,13 @@ music/bemidi.h
 music/cocoa_m.h
 music/extmidi.h
 music/libtimidity.h
+music/fluidsynth.h
 music/os2_m.h
 music/qtmidi.h
 os/macosx/macos.h
 os/macosx/osx_stdafx.h
 os/macosx/splash.h
+os/macosx/string_osx.h
 sound/cocoa_s.h
 video/cocoa/cocoa_keys.h
 video/cocoa/cocoa_v.h
@@ -464,6 +468,7 @@ dock_gui.cpp
 engine_gui.cpp
 error_gui.cpp
 fios_gui.cpp
+framerate_gui.cpp
 genworld_gui.cpp
 goal_gui.cpp
 graph_gui.cpp
@@ -527,6 +532,7 @@ widgets/dropdown_widget.h
 widgets/engine_widget.h
 widgets/error_widget.h
 widgets/fios_widget.h
+widgets/framerate_widget.h
 widgets/genworld_widget.h
 widgets/goal_widget.h
 widgets/graph_widget.h
@@ -916,6 +922,8 @@ script/api/script_window.cpp
 blitter/32bpp_anim.cpp
 blitter/32bpp_anim.hpp
 #if SSE
+blitter/32bpp_anim_sse2.cpp
+blitter/32bpp_anim_sse2.hpp
 blitter/32bpp_anim_sse4.cpp
 blitter/32bpp_anim_sse4.hpp
 #end
@@ -1091,9 +1099,6 @@ video/null_v.cpp
 #if WIN32
 	video/win32_v.cpp
 #end
-#if WINCE
-	video/win32_v.cpp
-#end
 #end
 
 # Music
@@ -1107,22 +1112,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
@@ -1132,6 +1132,9 @@ music/null_m.cpp
 #if LIBTIMIDITY
 	music/libtimidity.cpp
 #end
+#if FLUIDSYNTH
+	music/fluidsynth.cpp
+#end
 #end
 
 # Sound
@@ -1146,6 +1149,7 @@ sound/null_s.cpp
 #end
 #if WIN32
 	sound/win32_s.cpp
+	sound/xaudio2_s.cpp
 #end
 #end
 
@@ -1167,6 +1171,7 @@ sound/null_s.cpp
 		music/cocoa_m.cpp
 		sound/cocoa_s.cpp
 		os/macosx/splash.cpp
+		os/macosx/string_osx.cpp
 	#end
 #end
 
@@ -1174,10 +1179,7 @@ sound/null_s.cpp
 #if WIN32
 	os/windows/crashlog_win.cpp
 	os/windows/ottdres.rc
-	os/windows/win32.cpp
-#end
-#if WINCE
-	os/windows/ottdres.rc
+	os/windows/string_uniscribe.cpp
 	os/windows/win32.cpp
 #end