Merge remote-tracking branch 'upstream/master'

source.list

@@ -613,23 +613,6 @@ water_cmd.cpp
 waypoint_cmd.cpp
 zoning_cmd.cpp
 
-# CityMania files
-citymania/base64.h
-citymania/base64.cpp
-citymania/cm_bitstream.hpp
-citymania/cm_bitstream.cpp
-citymania/highlight.hpp
-citymania/highlight.cpp
-citymania/locations.hpp
-citymania/locations.cpp
-citymania/minimap.hpp
-citymania/minimap.cpp
-citymania/cm_saveload.hpp
-citymania/cm_saveload.cpp
-citymania/station_ui.hpp
-citymania/station_ui.cpp
-newgrf_revisions.hpp
-
 # Save/Load handlers
 saveload/afterload.cpp
 saveload/ai_sl.cpp
@@ -1220,6 +1203,8 @@ sound/null_s.cpp
 thread.h
 
 # CityMania
+citymania/cm_bitstream.hpp
+citymania/cm_bitstream.cpp
 citymania/cm_console_cmds.hpp
 citymania/cm_console_cmds.cpp
 citymania/cm_event.hpp
@@ -1232,5 +1217,21 @@ citymania/cm_main.cpp
 citymania/cm_tooltips.hpp
 citymania/cm_tooltips.cpp
 citymania/cm_type.hpp
+citymania/cm_saveload.hpp
+citymania/cm_saveload.cpp
+citymania/cm_settings.hpp
 citymania/extensions/cmext_town.hpp
 citymania/extensions/cmext_company.hpp
+
+# CityMania client
+citymania/base64.h
+citymania/base64.cpp
+citymania/highlight.hpp
+citymania/highlight.cpp
+citymania/locations.hpp
+citymania/locations.cpp
+citymania/minimap.hpp
+citymania/minimap.cpp
+citymania/station_ui.hpp
+citymania/station_ui.cpp
+newgrf_revisions.hpp