[Python-checkins] python/dist/src/Mac/Resources Carbon.r, 1.3, NONE balloons.bh, 1.4, NONE bundle.rsrc, 1.13, NONE dialogs.rsrc, 1.17.16.1, NONE gusiprefs.rsrc, 1.3, NONE pythonpath.r, 1.14.16.1, NONE tkpython.rsrc, 1.6, NONE version.r, 1.2, NONE

[kbk at users.sourceforge.net]

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

Removed Files:
      Tag: ast-branch
	Carbon.r balloons.bh bundle.rsrc dialogs.rsrc gusiprefs.rsrc 
	pythonpath.r tkpython.rsrc version.r 
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.


--- Carbon.r DELETED ---

--- balloons.bh DELETED ---

--- bundle.rsrc DELETED ---

--- dialogs.rsrc DELETED ---

--- gusiprefs.rsrc DELETED ---

--- pythonpath.r DELETED ---

--- tkpython.rsrc DELETED ---

--- version.r DELETED ---