summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@lanl.gov>2016-09-14 12:32:54 -0600
committerNathan Hjelm <hjelmn@lanl.gov>2016-09-14 12:33:45 -0600
commit73d15d1f8eee372e0609d072f3df705f7de18214 (patch)
tree8e6f4c4b993fde77f515f8e4a8d70d19ff71f09d
parentd11a1d1e137a8b5f859003a22d50ddfd52edea85 (diff)
downloadlibusb-73d15d1f8eee372e0609d072f3df705f7de18214.tar.gz
on to 1.0.21-rc5v1.0.21-rc5
Signed-off-by: Nathan Hjelm <hjelmn@me.gov>
-rw-r--r--ChangeLog1
-rw-r--r--libusb/version.h2
-rw-r--r--libusb/version_nano.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 46c440f..eba6901 100644
--- 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 81a7370..c2a3a65 100644
--- 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 a438e7c..ccf0669 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11147
+#define LIBUSB_NANO 11148