Merge svn r27779

Conflicts:
	src/autoreplace_gui.cpp
	src/economy.cpp
	src/fios_gui.cpp
	src/lang/spanish_MX.txt
	src/network/network_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/toolbar_gui.cpp
	src/window.cpp

src/os/unix/unix.cpp

@@ -16,6 +16,7 @@
 #include "../../core/random_func.hpp"
 #include "../../debug.h"
 #include "../../string_func.h"
+#include "../../fios.h"
 
 
 #include <dirent.h>
@@ -81,7 +82,7 @@ bool FiosIsRoot(const char *path)
 #endif
 }
 
-void FiosGetDrives()
+void FiosGetDrives(FileList &file_list)
 {
 	return;
 }