[Python-checkins] CVS: python/dist/src PLAN.txt,1.1,1.2 Makefile.pre.in,1.46,1.47

[Tim Peters]

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

Modified Files:
	Makefile.pre.in 
Added Files:
	PLAN.txt 
Log Message:
Merge of descr-branch back into trunk.



Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Makefile.pre.in	2001/07/31 13:24:44	1.46
--- Makefile.pre.in	2001/08/02 04:15:00	1.47
***************
*** 238,241 ****
--- 238,242 ----
  		Objects/cobject.o \
  		Objects/complexobject.o \
+ 		Objects/descrobject.o \
  		Objects/fileobject.o \
  		Objects/floatobject.o \
***************
*** 439,442 ****
--- 440,444 ----
  		Include/listobject.h \
  		Include/iterobject.h \
+ 		Include/descrobject.h \
  		Include/dictobject.h \
  		Include/methodobject.h \