Return to RelEng after tagging 1.2.5

diff --git a/CHANGES b/CHANGES
index 188c1261d61110e46b034059d1ad40d6496bfedf..ce1b139f7c19b87e7223d8818c99013449748c9e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.2 Release Engineering
+       CVS Tag: OPENLDAP_REL_ENG_1_2
+       <insert here>
+
 Changes included in OpenLDAP 1.2.5
        CVS Tag: OPENLDAP_REL_ENG_1_2_5
        Fixed slapd substring_comp_candidates null intersection bug (ITS#228)

diff --git a/build/version b/build/version
index f69dd1e0ef67416e68821340b1c1121274db799c..ca5522f838bbede73a8f40f09b6b42a36d897e1c 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.2.5-Release
+1.2.6-Engineering