[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.37,1.1.2.38

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	PLAN.txt 
Log Message:
Merge of trunk tag delta date2001-07-28 to date2001-07-30.


Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -C2 -d -r1.1.2.37 -r1.1.2.38
*** PLAN.txt	2001/07/28 05:04:10	1.1.2.37
--- PLAN.txt	2001/07/30 04:08:14	1.1.2.38
***************
*** 268,271 ****
--- 268,285 ----
  he dies of frustration while wrestling with CVS <0.9 wink>).
  ----------------------------------------------------------------------------
+ 2001-07-30
+ 
+ Doing this again while the expat and Windows installer changes are still
+ fresh on my mind.
+ 
+ Tagged trunk about 23:50 EDT on the 29th:
+     cvs tag date2001-07-30 python
+ 
+ Merged trunk delta into branch:
+ 
+     cvs -q -z3 up -j date2001-07-28 -j date2001-07-30 descr
+ 
+ 2 conflicts, resolved.
+ ----------------------------------------------------------------------------
  2001-07-28