[Python-checkins] CVS: python/dist/src/Mac/Distributions binary.include,1.16,1.17 dev.include,1.17,1.18

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Distributions
In directory usw-pr-cvs1:/tmp/cvs-serv5116/Distributions

Modified Files:
	binary.include dev.include 
Log Message:
Merging appropriate 2.1.1 fixes back into the main trunk.


Index: binary.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/binary.include,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** binary.include	2001/03/15 14:40:07	1.16
--- binary.include	2001/08/03 13:31:35	1.17
***************
*** 106,109 ****
--- 106,113 ----
  (':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', '')
***************
*** 209,214 ****
  (':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)
--- 213,218 ----
  (':setup.py', None)
  (':site-packages', None)
! (':Extensions:example3:README', None)
! (':Extensions:example2:README', None)
! (':Extensions:example:README', None)
! (':Mac:Contrib:osam:OSAm.carbon.slb', '')

Index: dev.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/dev.include,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dev.include	2001/03/27 21:33:53	1.17
--- dev.include	2001/08/03 13:31:35	1.18
***************
*** 117,120 ****
--- 117,123 ----
  (':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)
***************
*** 453,457 ****
  (':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)
--- 456,470 ----
  (':setup.py', None)
  (':site-packages', 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)