Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index a7a965c..65e1fbb 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -223,6 +223,12 @@
(':Mac:Build:_Win.mcp.xml', None)
(':Mac:Build:_dummy_tkinter.mcp', None)
(':Mac:Build:_dummy_tkinter.mcp.exp', None)
+(':Mac:Build:_hotshot.carbon.mcp', None)
+(':Mac:Build:_hotshot.carbon.mcp.exp', None)
+(':Mac:Build:_hotshot.carbon.mcp.xml', None)
+(':Mac:Build:_hotshot.mcp', None)
+(':Mac:Build:_hotshot.mcp.exp', None)
+(':Mac:Build:_hotshot.mcp.xml', None)
(':Mac:Build:_symtable.carbon.mcp', None)
(':Mac:Build:_symtable.carbon.mcp.exp', None)
(':Mac:Build:_symtable.carbon.mcp.xml', None)
@@ -423,6 +429,7 @@
(':Modules:_codecsmodule.c', None)
(':Modules:_curses_panel.c', None)
(':Modules:_cursesmodule.c', None)
+(':Modules:_hotshot.c', None)
(':Modules:_localemodule.c', None)
(':Modules:_sre.c', None)
(':Modules:_testcapimodule.c', None)
@@ -589,10 +596,7 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Build:_hotshot.mcp.xml', None)
-(':Mac:Build:_hotshot.mcp.exp', None)
-(':Mac:Build:_hotshot.mcp', None)
-(':Mac:Build:_hotshot.carbon.mcp.xml', None)
-(':Mac:Build:_hotshot.carbon.mcp.exp', None)
-(':Mac:Build:_hotshot.carbon.mcp', None)
-(':Modules:_hotshot.c', None)
+(':Mac:Build:hfsplus.carbon.mcp.xml', None)
+(':Mac:Build:hfsplus.carbon.mcp.exp', None)
+(':Mac:Build:hfsplus.carbon.mcp', None)
+(':Mac:mwerks:mwerks_shlib_config.h', '')