Return to releng

diff --git a/CHANGES b/CHANGES
index 29ad95ddbef8bbd1b668f5540965043dd6297a62..fffd02edee74a4d7ae43a1b3201a1c102c29ade4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.2.12 Engineering
+       CVS Tag: OPENLDAP_REL_ENG_1_2
+       <insert changes here>
+
 Changes included in OpenLDAP 1.2.11
        CVS Tag: OPENLDAP_REL_ENG_1_2_11
        Fixed /tmp races in ud, ldapsearch, ldbmtest and slurpd

diff --git a/build/version b/build/version
index 74af5c21c7b72e4c106e2678fbe945298320e386..756eb78e283354514a308ca2eeb65eb6679d70e4 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.2.11-Release
+1.2.12-Engineering