on to 1.0.21-rc5

Signed-off-by: Nathan Hjelm <hjelmn@me.gov>

diff --git a/ChangeLog b/ChangeLog
index 46c440f581871f4f154940757fe4604f9500596b..eba69019535856896761bb5b97656dde3f7ade29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ visit: http://log.libusb.info
 * Linux: Deal with receiving POLLERR before all transfers have completed
 * Solaris: Add solaris backend
 * Windows: Add Visual Studio 2015 support
+* Windows: Add usbdk backend
 * Prevent attempts to recursively handle events
 * Fix race condition in handle_timeout()
 * Allow transferred argument to be optional in bulk APIs

diff --git a/libusb/version.h b/libusb/version.h
index 81a7370141788568ac0055ce59167e2bc465f072..c2a3a65a122a9f6da64d7347f9a9177dbb8f8a9b 100644 (file)
--- a/libusb/version.h
+++ b/libusb/version.h
@@ -14,5 +14,5 @@
 #endif
 /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
 #ifndef LIBUSB_RC
-#define LIBUSB_RC "-rc4"
+#define LIBUSB_RC "-rc5"
 #endif

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index a438e7cfdae64895f6cd70685ca2c549da67f86a..ccf06691c6a9b9faa032c41bdf9a157b1d2565b1 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11147
+#define LIBUSB_NANO 11148