[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.37.2.4,1.37.2.5 PLAN.txt,1.1.2.38,1.1.2.39

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	Makefile.pre.in PLAN.txt 
Log Message:
Mrege of trunk tag delta date2001-07-30 to date2001-08-01.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -C2 -d -r1.37.2.4 -r1.37.2.5
*** Makefile.pre.in	2001/07/28 05:02:57	1.37.2.4
--- Makefile.pre.in	2001/08/02 02:40:42	1.37.2.5
***************
*** 215,218 ****
--- 215,219 ----
  		Python/modsupport.o \
  		Python/mystrtoul.o \
+ 		Python/mysnprintf.o \
  		Python/pyfpe.o \
  		Python/pystate.o \

Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -C2 -d -r1.1.2.38 -r1.1.2.39
*** PLAN.txt	2001/07/30 04:08:14	1.1.2.38
--- PLAN.txt	2001/08/02 02:40:42	1.1.2.39
***************
*** 268,271 ****
--- 268,285 ----
  he dies of frustration while wrestling with CVS <0.9 wink>).
  ----------------------------------------------------------------------------
+ 2001-08-01  Merging descr-branch back into trunk.
+ 
+ Tagged trunk about 22:05:
+     cvs tag date2001-08-01 python
+ 
+ Merged trunk delta into branch:
+ 
+     cvs -q -z3 up -j date2001-07-30 -j date2001-08-01 descr
+ 
+ No conflicts (! first time ever!) ... but problems with pythoncore.dsp.
+ Resolved.
+ 
+ Rebuilt from scratch; ran all tests; checked into branch about 22:40.
+ ----------------------------------------------------------------------------
  2001-07-30