X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ChangeLog;h=031566222869a9c1ee665318e0b8fac6c7b16f0a;hp=b42087786f8131846d956b5e6e0810ca6e79db47;hb=61afff55ab7657493a14e39153c5c9caad2d7013;hpb=195ec69650203868ffac02d7a92248688be3c9b1

diff --git a/ChangeLog b/ChangeLog
index b420877..0315662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
-New in 1.2 - 2014-11-XX
+New in 1.3 - 2016-04-xx
+-----------------------
+* Added ftdi_usb_get_strings2() to prevent automatic device close (Fahrzin Hemmati)
+* Added ftdi_transfer_data_cancel() for cancellation of a submitted transfer,
+  avoided resubmittion of a canceled transfer in the callbacks,
+  replaced calls to libusb_handle_events with
+  libusb_handle_events_timeout_completed (Eugene Hutorny)
+* ftdi_eeprom / eeprom handling:
+  * Add support for arbitrary user data (Salvador Eduardo Tropea)
+  * Add --build-eeprom support (Salvador Eduardo Tropea)
+  * Fix use_usb_version config file option (Thilo Schulz)
+  * Ability to include other config files in EEPROM config file (Thilo Schulz)
+  * Add external oscillator enable bit (Raphael Assenat)
+  * Support channel configuration (Stephan Linz)
+  * Added --device option to ftdi_eeprom to specify FTDI device (Robin Haberkorn)
+  * Fixed EEPROM user-area space checks for FT232R and FT245R chips (Robin Haberkorn)
+* Various improvements to CBUS handling, including the EEPROM (Robin Haberkorn)
+* swig wrapper: Fix handling of binary strings in ftdi_write_data()
+  for python 3 (xantares09)
+* cbus python example code (Rodney Sinclair)
+* ftdi_stream: fix timeout setting (Ларионов Даниил)
+* Fixed typo in CBUS defines: CBUSG_DRIVE1 -> CBUSH_DRIVE1
+
+New in 1.2 - 2014-11-21
 -----------------------
 * Support for FT230X devices (Uwe Bonnes)
 * ftdi_usb_get_strings(): Don't try to open an already open device (Denis Sirotkin)