summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@me.com>2016-10-01 06:49:09 -0600
committerNathan Hjelm <hjelmn@me.com>2016-10-01 06:49:09 -0600
commit4eca418ef50dcaf3f2fca11158410acd72e8e2e2 (patch)
tree8fe1a2651ee8e82d730edbf5a97ac62a9e92d04b
parent5fa6d3bb666ca035b627d028fbb4e0d9b8d18c6b (diff)
downloadlibusb-4eca418ef50dcaf3f2fca11158410acd72e8e2e2.tar.gz
on to 1.0.21-rc6
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--ChangeLog2
-rw-r--r--libusb/version.h2
-rw-r--r--libusb/version_nano.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eba6901..2b076b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
For detailed information about the changes below, please see the git log or
visit: http://log.libusb.info
-2016-09-12: v1.0.21:
+2016-10-01: v1.0.21:
* Core: Refactor code related to transfer flags and timeout handling
* Darwin: Ignore root hub simulation devices
* Darwin: Improved support for OS X El Capitan
diff --git a/libusb/version.h b/libusb/version.h
index c2a3a65..a8f6739 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 "-rc5"
+#define LIBUSB_RC "-rc6"
#endif
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 1eb7fa8..e7cb421 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11149
+#define LIBUSB_NANO 11150