[Python-checkins] python/dist/src/Mac/OSXResources/app/Resources PythonSource.icns,1.1,NONE PythonCompiled.icns,1.1,NONE Applet-InfoPlist.strings,1.1,NONE Applet-Info.plist,1.2,NONE

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Mon, 28 Apr 2003 10:22:38 -0700


Update of /cvsroot/python/python/dist/src/Mac/OSXResources/app/Resources
In directory sc8-pr-cvs1:/tmp/cvs-serv27228/Mac/OSXResources/app/Resources

Removed Files:
      Tag: ast-branch
	PythonSource.icns PythonCompiled.icns Applet-InfoPlist.strings 
	Applet-Info.plist 
Log Message:
Merge head to this branch.

Merge all sorts of changes from just before 2.3b1 into the ast
branch.  This should make the eventual merge back to the trunk easier.

The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.

The only significant conflicts appeared to be in pythonrun.c.


--- PythonSource.icns DELETED ---

--- PythonCompiled.icns DELETED ---

--- Applet-InfoPlist.strings DELETED ---

--- Applet-Info.plist DELETED ---