[Python-checkins] python/dist/src/Mac/mwerks errno_unix.h, 1.7, NONE macuseshlstart.c, 1.3, NONE mwerks_nscarbon.pch, 1.1, NONE mwerks_nscarbon_config.h, 1.9.2.1, NONE mwerks_pyexpat_config.h, 1.2.4.1, NONE mwerks_shcarbon.pch, 1.1, NONE mwerks_shcarbon_config.h, 1.8, NONE mwerks_smcarbon.pch, 1.1, NONE mwerks_smcarbon_config.h, 1.1, NONE mwerks_thrcarbonsm_config.h, 1.6, NONE mwerks_threadsmall_config.h, 1.6, NONE mwerks_tkplugin_config.h, 1.8, NONE mwfopenrf.c, 1.5, NONE

kbk at users.sourceforge.net kbk at users.sourceforge.net
Fri Jan 7 08:02:27 CET 2005


Update of /cvsroot/python/python/dist/src/Mac/mwerks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12896/Mac/mwerks

Removed Files:
      Tag: ast-branch
	errno_unix.h macuseshlstart.c mwerks_nscarbon.pch 
	mwerks_nscarbon_config.h mwerks_pyexpat_config.h 
	mwerks_shcarbon.pch mwerks_shcarbon_config.h 
	mwerks_smcarbon.pch mwerks_smcarbon_config.h 
	mwerks_thrcarbonsm_config.h mwerks_threadsmall_config.h 
	mwerks_tkplugin_config.h mwfopenrf.c 
Log Message:
Merge MAIN into ast-branch
cvs  up -kk -j mrg_to_ast-branch_24APR03  -j mrg_to_ast-branch_05JAN05
  (date of earlier merge estimated 24Apr03 17:30 UTC, repository tagged)

Not merged:
Lib/test/test_compile.py,  Python/compile.c

Refer to Tracker Patch # 1097671 for the merge output and list of
conflicts resolved.


--- errno_unix.h DELETED ---

--- macuseshlstart.c DELETED ---

--- mwerks_nscarbon.pch DELETED ---

--- mwerks_nscarbon_config.h DELETED ---

--- mwerks_pyexpat_config.h DELETED ---

--- mwerks_shcarbon.pch DELETED ---

--- mwerks_shcarbon_config.h DELETED ---

--- mwerks_smcarbon.pch DELETED ---

--- mwerks_smcarbon_config.h DELETED ---

--- mwerks_thrcarbonsm_config.h DELETED ---

--- mwerks_threadsmall_config.h DELETED ---

--- mwerks_tkplugin_config.h DELETED ---

--- mwfopenrf.c DELETED ---



More information about the Python-checkins mailing list