Merge branch 'cvsimport'

[sympathy.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6b15cda157577c01c5da03309871c9969e833674..d21e0af8398f7601b4a4d137c130847236e72775 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,17 @@
-#
-#
-# ChangeLog:
-#
-# Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
-# All rights reserved.
-#
-# $Id$
-#
-# $Log$
-# Revision 1.1  2008/02/03 16:20:23  james
-# *** empty log message ***
-#
-#
-#
+ChangeLog:
+
+Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+All rights reserved.
+
+$Id: ChangeLog,v 1.2 2008/03/11 18:21:03 james Exp $
+
+1.2.0:
+       Added -I and -N options
+       Added logging for client connexions
+       Added sighup handling
+       Fixed a race in -c -s mode where client would attempt
+               to connect to server before server was ready
+       Changed socket protocol so that -ls doesn't cause 
+               entire history and state to be placed in server's
+               send buffer and then dumped.
+