[Python-checkins] python/dist/src/Mac/Tools/CGI BuildCGIApplet.py, 1.5, NONE BuildCGIApplet.rsrc, 1.5, NONE CGI_README.txt, 1.1, NONE PythonCGISlave.py, 1.2, NONE PythonCGISlave.rsrc, 1.5, NONE cgi.html, 1.1, NONE

[kbk at users.sourceforge.net]

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

Removed Files:
      Tag: ast-branch
	BuildCGIApplet.py BuildCGIApplet.rsrc CGI_README.txt 
	PythonCGISlave.py PythonCGISlave.rsrc cgi.html 
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.


--- BuildCGIApplet.py DELETED ---

--- BuildCGIApplet.rsrc DELETED ---

--- CGI_README.txt DELETED ---

--- PythonCGISlave.py DELETED ---

--- PythonCGISlave.rsrc DELETED ---

--- cgi.html DELETED ---