Merge branch 'master' into jgrpp

# Conflicts:
#	src/core/alloc_type.hpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/map_sl.cpp
#	src/station_cmd.cpp

src/fios.h

@@ -109,6 +109,7 @@ struct FiosItem {
 	uint64 mtime;
 	char title[64];
 	char name[MAX_PATH];
+	bool operator< (const FiosItem &other) const;
 };
 
 /** List of file information. */
@@ -229,6 +230,4 @@ void FiosMakeSavegameName(char *buf, const char *name, const char *last);
 
 FiosType FiosGetSavegameListCallback(SaveLoadOperation fop, const char *file, const char *ext, char *title, const char *last);
 
-int CDECL CompareFiosItems(const FiosItem *a, const FiosItem *b);
-
 #endif /* FIOS_H */