From f700e87a6ea24ed1ba8e99b9197d32a14079e6b3 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Fri, 1 Sep 2006 13:58:20 +0000
Subject: [PATCH] Merge changes

---
 ChangeLog | 12 ++++++++++++
 TODO      |  2 --
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0775cd78b8..8b9ffdbb9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,18 @@
 
 	* Refactoring samplerate conversion, -DDATAFORMAT_IS_FLOAT allow the user to use float instead of int
 
+2006-08-25  Yan Morin
+
+	* Add support for <esc> key to hangup a call
+
+	* Remove handling of Key_Meta and Key_Alt, need to be able to send @ with alt+char or shift
+
+2006-08-23  Yan Morin
+
+	* Add AudioDevice, a container to get audiodevice listing
+
+	* Add --with-debug to ./configure
+
 2006-08-02  Yan Morin
 
 	* Add IAX quelch/unquelch
diff --git a/TODO b/TODO
index 4127a21549..905f06830e 100644
--- a/TODO
+++ b/TODO
@@ -18,11 +18,9 @@ For sflphone-qt:
 ---------------
 Save account status if modified in configuration
 
-
 From FIXME:
 - sflphoned don't return any result at the second time getcallstatus is called.
 - sflphoned don't return a 206 on getcallstatus when one call is ringing.
 - unhold should not return an error if it's not holded
 
 - Check if the device as the same name (usb), not only the number
-- Combo box for the device
-- 
GitLab