libusb 1.0.20-rc2

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index a30c01d7a234304c4d825a79a404f7d2ec297da4..736655e20eb0e1132a8c3c802aab451e3f3209bc 100644 (file)
--- 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
 
-2015-07-29: v1.0.20
+2015-09-02: v1.0.20
 * Add Haiku support
 * Fix multiple memory and resource leaks (#16, #52, #76, #81)
 * Fix possible deadlock when executing transfer callback
@@ -11,6 +11,8 @@ visit: http://log.libusb.info
 * Windows: Fix broken builds Cygwin/MinGW builds and compiler warnings
 * Windows: Fix broken bus number lookup
 * Windows: Improve submission of control requests for composite devices
+* Examples: Add two-stage load support to fxload (#12)
+* Correctly report cancellations due to timeouts
 * Improve efficiency of event handling
 * Improve speed of transfer submission in multi-threaded environments
 * Various other bug fixes and improvements

diff --git a/libusb/version.h b/libusb/version.h
index 774dd074234c4a0aab660cdca3db7f7931ab9da2..4d587b421124da95ab405cb4dd417edffd0da52b 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 "-rc1"
+#define LIBUSB_RC "-rc2"
 #endif

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index a1bec0ac6044097738c249ffe91b82fb126cde81..f71f9180a3622b7da9606432ec7be7ea9ca3dd19 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10998
+#define LIBUSB_NANO 10999