Auto-merge of NEWS from 3.3 didn't work right.

1c94750f · Tim Peters · 75f7ad02 · 1c94750f
Commit 1c94750f authored Sep 17, 2004 by Tim Peters
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

trunk/NEWS.txt trunk/NEWS.txt +10 -9

No files found.
--- a/trunk/NEWS.txt
+++ b/trunk/NEWS.txt
-What's new in ZODB3 3.3?
+What's new in ZODB3 3.4?
 ========================
-Release date: DD-Sep-2004
+Release date: DD-MMM-2004


-What's new in ZODB3 3.3 release candidate 1?
-============================================
-Release date: 14-Sep-2004
-
 Tools
 -----

@@ -18,9 +14,14 @@ which objects did it reference?  what kind of object was it?).
 ZODB/test/testfsoids.py is a tutorial doctest.


-What's new in ZODB3 3.3 ?
-=========================
-Release date: DD-MMM-YYYY
+What's new in ZODB3 3.3?
+========================
+Release date: DD-Sep-2004
+
+
+What's new in ZODB3 3.3 release candidate 1?
+============================================
+Release date: 14-Sep-2004

 Connection
 ----------