release: on to 1.0.21-rc3

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

diff --git a/ChangeLog b/ChangeLog
index 3b07a8f50d68bf978dea3cc5c4e74062051a62e9..70319bceba877e30a63f01c2d7908705945cdb85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,14 @@ For detailed information about the changes below, please see the git log or
 visit: http://log.libusb.info
 
 2016-07-20: 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
 * Linux: Support preallocating kernel memory for zerocopy USB
+* Linux: Deal with receiving POLLERR before all transfers have completed
 * Solaris: Add solaris backend
 * Windows: Add Visual Studio 2015 support
-* Prevent attempts to recursively hande events
+* Prevent attempts to recursively handle events
 * Fix race condition in handle_timeout()
 * Allow transferred argument to be optional in bulk APIs
 * Various other bug fixes and improvements

diff --git a/libusb/version.h b/libusb/version.h
index 4ee1f278c384a13cb8febbe711c4775961cca959..54d638200a90ca8595ff09255469bcdcf10d1394 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 "-rc2"
+#define LIBUSB_RC "-rc3"
 #endif

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 299c4641c9299dec44588da78f615280380cc28b..43ace0cbf74e98eb7f1adaac2d826103a1c5ebcc 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11139
+#define LIBUSB_NANO 11140