Tick to 1.9.15-dev

4 files changed, 9 insertions, 5 deletions

diff --git a/configure.py b/configure.py
index d3f450c8d..6b9923dc9 100755
--- a/configure.py
+++ b/configure.py
@@ -43,11 +43,11 @@ class BuildConfigurationInformation(object):
     """
     version_major = 1
     version_minor = 9
-    version_patch = 14
-    version_so_patch = 14
+    version_patch = 15
+    version_so_patch = 15
     version_suffix = ''
 
-    version_datestamp = 20110301
+    version_datestamp = 0
 
     version_string = '%d.%d.%d%s' % (
         version_major, version_minor, version_patch, version_suffix)
diff --git a/doc/log.txt b/doc/log.txt
index f918e4027..9313ac2f6 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -1,4 +1,8 @@
 
+* 1.9.15-dev, ????-??-??
+ - Pipe will delete empty output queues as soon as they are no longer
+   needed, even if earlier messages still have data unread.
+
 * 1.9.14, 2011-03-01
  - Add support for bcrypt, OpenBSD's password hashing scheme
  - Add support for NIST's AES key wrapping algorithm
diff --git a/readme.txt b/readme.txt
index 694c4d47c..fde088312 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-Botan 1.9.14, 2011-03-01
+Botan 1.9.15-dev, ????-??-??
 http://botan.randombit.net/
 
 Botan is a C++ class library for performing a wide variety of
diff --git a/src/entropy/hres_timer/hres_timer.cpp b/src/entropy/hres_timer/hres_timer.cpp
index b0bbf6fa7..ffe8eb8a9 100644
--- a/src/entropy/hres_timer/hres_timer.cpp
+++ b/src/entropy/hres_timer/hres_timer.cpp
@@ -47,7 +47,7 @@ void High_Resolution_Timestamp::poll(Entropy_Accumulator& accum)
 #elif defined(BOTAN_TARGET_ARCH_IS_ALPHA)
    asm volatile("rpcc %0" : "=r" (rtc));
 
-#elif defined(BOTAN_TARGET_ARCH_IS_SPARC64)
+#elif defined(BOTAN_TARGET_ARCH_IS_SPARC64) && !defined(BOTAN_TARGET_OS_IS_OPENBSD)
    asm volatile("rd %%tick, %0" : "=r" (rtc));
 
 #elif defined(BOTAN_TARGET_ARCH_IS_IA64)