Bump trunk to 1.1.0-dev so that we can try to isolate incompatible changes.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@76076 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 10 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index 6b88273fd..53e836392 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
-Changes for APR 1.1 [Deferring these features when 1.0 is rolled out.]
+Changes for APR 1.1.0
+
+  *) [NOT COMMITTED?] Add a new PRNG. Note that the implementation of SHA-256
+     is a stop-gap pending snarfing the SHA-1 implementation from apr-util
+     and upgrading it to do SHA-256. Not yet ready for prime time.
+     [Ben Laurie]
+
+Changes for APR 1.0.1
 
   *) Fix HUP return codes in pollset when using KQueue.
      [Paul Querna]
@@ -29,11 +36,6 @@ Changes for APR 1.1 [Deferring these features when 1.0 is rolled out.]
   *) Win32: Fix bug in apr_socket_sendfile that interferred with
      Win32 LSPs. PR 23982 [Jan Bilek, Bill Stoddard]
 
-  *) Add a new PRNG. Note that the implementation of SHA-256 is a
-     stop-gap pending snarfing the SHA-1 implementation from apr-util
-     and upgrading it to do SHA-256. Not yet ready for prime time.
-     [Ben Laurie]
-
   *) Win32: Fix bug tracking the file pointer on a file opened for 
      overlapped/APR_XTHREAD io. [Bill Stoddard]
 
diff --git a/include/apr_version.h b/include/apr_version.h
index 08d5f3a26..cbf2e82ff 100644
--- a/include/apr_version.h
+++ b/include/apr_version.h
@@ -57,10 +57,10 @@ extern "C" {
  * Minor API changes that do not cause binary compatibility problems.
  * Should be reset to 0 when upgrading APR_MAJOR_VERSION
  */
-#define APR_MINOR_VERSION       0
+#define APR_MINOR_VERSION       1
 
 /** patch level */
-#define APR_PATCH_VERSION       1
+#define APR_PATCH_VERSION       0
 
 /**
  * This symbol is defined for internal, "development" copies of APR.