[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 30615 from 3.4 branch.

[Tim Peters]

Log message for revision 30616:
  Merge rev 30615 from 3.4 branch.
  
  Revert rev 30607 -- Zope trunk actually does still use ZODB's _Persistence.c,
  although ZODB doesn't.
  

Changed:
  U   ZODB/trunk/NEWS.txt
  A   ZODB/trunk/src/Persistence/_Persistence.c

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-06-02 22:03:32 UTC (rev 30615)
+++ ZODB/trunk/NEWS.txt	2005-06-02 22:05:14 UTC (rev 30616)
@@ -3,7 +3,7 @@
 Release date: DD-MMM-YYYY
 
 
-What's new in ZODB3 3.4b5?
+What's new in ZODB3 3.4b4?
 ==========================
 Release date: DD-MMM-2005
 
@@ -11,7 +11,7 @@
 ongoing Zope 2.8 and Zope3 development) since the last public ZODB 3.4
 release.  These are the dates of the internal releases:
 
-- 3.4b4 02-Jun-2005
+- 3.4b4 DD-MMM-2005
 - 3.4b3 27-May-2005
 - 3.4b2 26-May-2005
 
@@ -38,13 +38,6 @@
   ``zope.testing.testrunner``.  See the latter's documentation
   for command-line arguments.
 
-_Persistence.c
---------------
-
-- (3.4b4) The source code for this was removed from the project.  Zope (2.8)
-  has its own copy, and the C code hadn't been compiled in ZODB since before
-  ZODB 3.3.
-
 Error reporting
 ---------------
 

Copied: ZODB/trunk/src/Persistence/_Persistence.c (from rev 30615, ZODB/branches/3.4/src/Persistence/_Persistence.c)


Property changes on: ZODB/trunk/src/Persistence/_Persistence.c
___________________________________________________________________
Name: cvs2svn:cvs-rev
   + 1.2
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native