From e7f4d0778e0506c83a709b43a139a90eb4854aef Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <yobibe@gmail.com>
Date: Sat, 9 Mar 2013 11:27:56 +0100
Subject: [PATCH] Update NEWS & Changelog

---
 ChangeLog | 20 ++++++++++++++++++++
 NEWS      |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ea24f75..c04fbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+TBD
+---
+
+Fixes:
+ - Fix bug when compiling without libusb
+ - Fixes several memory leaks in error handling conditions
+ - Remove calls to exit() from the library
+ - Numerous minor fixes suggested by cppcheck & clang
+ - Windows: Clean up compiler/linker warnings
+
+Improvements:
+ - Developers HACKING file: introduce clang & cppcheck for better code
+ - Windows: better logging via OutputDebugString()
+
+Changes:
+ - Upon malloc error, nfc_init() doesn't force exit() anymore
+   so now you should test if context != NULL after nfc_init() call
+ - API: nfc_initiator_target_is_present() & str_nfc_target()
+   now take a pointer to nfc_target as argument instead of passing by value
+
 Mar 03, 2013 - 1.7.0-rc6 (release candidate)
 --------------------------------------------
 
diff --git a/NEWS b/NEWS
index 59a18a6..f6c2170 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,10 @@ New in 1.7.0-***:
 API Changes:
 
   * Functions
-    - nfc_initiator_target_is_present() & str_nfc_target()
+    - nfc_initiator_target_is_present() & str_nfc_target():
       now take a pointer to nfc_target as argument
+    - nfc_init(): upon malloc error, doesn't force exit() anymore
+      so now you should test if context != NULL after nfc_init() call
 
 New in 1.7.0-rc5: