Merging changes from release22-branch.
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index e7476e6..70c75cb 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -63,13 +63,16 @@
(':Mac:Build:Printing.mcp', None)
(':Mac:Build:Printing.mcp.exp', None)
(':Mac:Build:Printing.mcp.xml', None)
+(':Mac:Build:PythonCore.axp', None)
(':Mac:Build:PythonCore.exp', None)
(':Mac:Build:PythonCore.mcp', None)
(':Mac:Build:PythonCoreCarbon.exp', None)
(':Mac:Build:PythonInterpreter.mcp', None)
+(':Mac:Build:PythonInterpreter.old.mcp', None)
(':Mac:Build:PythonStandSmall.mcp', None)
(':Mac:Build:PythonStandSmall.mcp~0', None)
(':Mac:Build:PythonStandSmall.mcp~1', None)
+(':Mac:Build:PythonStandSmall.old.mcp', None)
(':Mac:Build:PythonStandalone.mcp', None)
(':Mac:Build:PythonStandalone.mcp~0', None)
(':Mac:Build:PythonStandalone.mcp~1', None)
@@ -104,6 +107,12 @@
(':Mac:Build:_CF.carbon.mcp', None)
(':Mac:Build:_CF.carbon.mcp.exp', None)
(':Mac:Build:_CF.carbon.mcp.xml', None)
+(':Mac:Build:_CG.carbon.mcp', None)
+(':Mac:Build:_CG.carbon.mcp.exp', None)
+(':Mac:Build:_CG.carbon.old.mcp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
(':Mac:Build:_Cm.carbon.mcp', None)
(':Mac:Build:_Cm.carbon.mcp.exp', None)
(':Mac:Build:_Cm.carbon.mcp.xml', None)
@@ -223,6 +232,7 @@
(':Mac:Build:_Win.mcp.xml', None)
(':Mac:Build:_dummy_tkinter.mcp', None)
(':Mac:Build:_dummy_tkinter.mcp.exp', None)
+(':Mac:Build:_dummy_tkinter.old.mcp', None)
(':Mac:Build:_hotshot.carbon.mcp', None)
(':Mac:Build:_hotshot.carbon.mcp.exp', None)
(':Mac:Build:_hotshot.carbon.mcp.xml', None)
@@ -373,6 +383,7 @@
(':Mac:ReadMe', None)
(':Mac:ReadMe-dev', ':')
(':Mac:ReadMe-src', None)
+(':Mac:ReadMe~0', None)
(':Mac:Relnotes', None)
(':Mac:Relnotes-source', None)
(':Mac:Resources:Carbon.r', None)
@@ -529,6 +540,8 @@
(':Modules:testcapi_long.h', None)
(':Modules:threadmodule.c', None)
(':Modules:timemodule.c', None)
+(':Modules:timemodule.c~0', None)
+(':Modules:timemodule.c~1', None)
(':Modules:timing.h', None)
(':Modules:timingmodule.c', None)
(':Modules:tkappinit.c', None)
@@ -600,16 +613,3 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Build:_CG.carbon.old.mcp', None)
-(':Mac:Build:_CG.carbon.mcp.exp', None)
-(':Mac:Build:_CG.carbon.mcp', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
-(':Mac:Build:_CarbonEvt.carbon.mcp', None)
-(':Mac:ReadMe~0', None)
-(':Modules:timemodule.c~1', None)
-(':Modules:timemodule.c~0', None)
-(':Mac:Build:PythonStandSmall.old.mcp', None)
-(':Mac:Build:PythonInterpreter.old.mcp', None)
-(':Mac:Build:PythonCore.axp', None)
-(':Mac:Build:_dummy_tkinter.old.mcp', None)