From 6b263466e0ecf411f1100fa4a9f3ad443a2249c7 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 10 Dec 2013 21:45:44 +0100
Subject: [PATCH] fix another alloc/free mismatch (required for windows)

---
 NEWS                            | 14 ++++++++++++--
 coreapi/bellesip_sal/sal_impl.c |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 8797315b0..872a678fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
 linphone-3.7...??
-	Liblinphone level improvements thanks to belle-sip new SIP stack:
-	* multiple SIP transports simualtaneously now allowed
+	Application level improvements:
+	* It is now possible to configure multiple proxy accounts with different transports (UDP, TCP, TLS)
+	* can work with IPv6 and IPv4 simultaneously
+	* User can choose video rendering method on Linux
+	* Video HD formats support added, leveraging on multiple cores for encoding if available
+	* Keyboard can be used for DTMF input
+	* Faster and higly responsive UI thanks to fully asynchronous operation of the liblinphone.
+	* Addon of opus codec
+
+	Liblinphone level improvements thanks to new "belle-sip" SIP stack:
+	* multiple SIP transports simultaneously now allowed
 	* IP dual stack: can use IPv6 and IPv4 simultaneously
 	* fully asynchronous behavior: no more lengthly DNS or connections 
 	* +sip.instance parameter (RFC5626)
@@ -10,6 +19,7 @@ linphone-3.7...??
 	* SIP transaction state machines improved (RFC6026)
 	* Privacy API (RFC3323, RFC3325)
 	* Full support of rich presence in (RFC4480)
+	* Better handling of sips scheme in URIs.
 
 
 linphone-3.6.1 -- June 17, 2013
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 37384f3e9..08986eb89 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -810,11 +810,11 @@ const SalCustomHeader *sal_op_get_recv_custom_header(SalOp *op){
 
 void sal_set_uuid(Sal *sal, const char *uuid){
 	if (sal->uuid){
-		belle_sip_free(sal->uuid);
+		ms_free(sal->uuid);
 		sal->uuid=NULL;
 	}
 	if (uuid)
-		sal->uuid=belle_sip_strdup(uuid);
+		sal->uuid=ms_strdup(uuid);
 }
 
 typedef struct {