Merging appropriate 2.1.1 fixes back into the main trunk.
diff --git "a/Mac/Distributions/\050vise\051/Python 2.1.vct" "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
index d86b1be..1c38af1 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.1.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
Binary files differ
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index c1ca530..4701bfc 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -105,6 +105,10 @@
(':Mac:Build', None)
(':Mac:Compat:Icon', None)
(':Mac:Contrib:AECaptureParser', '')
+(':Mac:Contrib:BBPy.lm:BBpy.r', None)
+(':Mac:Contrib:BBPy.lm:Python', '')
+(':Mac:Contrib:BBPy.lm:Python Keywords.rsrc', None)
+(':Mac:Contrib:BBPy.lm:PythonBBLM.txt', '')
(':Mac:Contrib:BBPy:PythonSlave.py', '')
(':Mac:Contrib:BBPy:README', '')
(':Mac:Contrib:BBPy:Run as Python', '')
@@ -208,7 +212,7 @@
(':pystone.py', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Contrib:BBPy.lm:Python', '')
-(':Mac:Contrib:BBPy.lm:PythonBBLM.txt', '')
-(':Mac:Contrib:BBPy.lm:BBpy.r', None)
-(':Mac:Contrib:BBPy.lm:Python Keywords.rsrc', None)
+(':Extensions:example3:README', None)
+(':Extensions:example2:README', None)
+(':Extensions:example:README', None)
+(':Mac:Contrib:osam:OSAm.carbon.slb', '')
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index 4fae0e1..ff3f0c8 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -116,6 +116,9 @@
(':Mac:Build:TE.mcp.exp', None)
(':Mac:Build:TE.mcp.xml', None)
(':Mac:Build:TE.mcp.xml.out', None)
+(':Mac:Build:_dummy_tkinter.mcp', None)
+(':Mac:Build:_dummy_tkinter.mcp.exp', None)
+(':Mac:Build:_dummy_tkinter.old.mcp', None)
(':Mac:Build:_symtable.carbon.mcp', None)
(':Mac:Build:_symtable.carbon.mcp.exp', None)
(':Mac:Build:_symtable.carbon.mcp.xml', None)
@@ -452,6 +455,16 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Build:_dummy_tkinter.old.mcp', None)
-(':Mac:Build:_dummy_tkinter.mcp.exp', None)
-(':Mac:Build:_dummy_tkinter.mcp', None)
+(':Extensions:example', None)
+(':Extensions:example2', None)
+(':Extensions:example3', None)
+(':Mac:Demo:mlte:mlted.py', None)
+(':Mac:Build:Mlte.mcp.xml', None)
+(':Mac:Build:Mlte.mcp.exp', None)
+(':Mac:Build:Mlte.mcp', None)
+(':Mac:Build:Mlte.carbon.mcp.xml', None)
+(':Mac:Build:Mlte.carbon.mcp.exp', None)
+(':Mac:Build:Mlte.carbon.mcp', None)
+(':Mac:Build:CF.carbon.mcp.xml', None)
+(':Mac:Build:CF.carbon.mcp.exp', None)
+(':Mac:Build:CF.carbon.mcp', None)