From 202cc4119ab0006fee4453bad4297f45acf41b92 Mon Sep 17 00:00:00 2001
From: james <>
Date: Tue, 11 Mar 2008 18:21:03 +0000
Subject: *** empty log message ***

---
 ChangeLog       | 32 +++++++++++++++++---------------
 version-md5sums |  1 +
 version-micro   |  2 +-
 version-stamps  |  1 +
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b15cda..79c3008 100644
--- 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$
+
+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.
+
diff --git a/version-md5sums b/version-md5sums
index d7651bf..a178396 100644
--- a/version-md5sums
+++ b/version-md5sums
@@ -15,3 +15,4 @@ a5ee6f647e6d98d5f06b75a70b7bf9a5	1.1.9
 7f8612564a03e6cb722e8692027252f2	1.1.11
 0c169eaf189eb8f9b375254b69e63c31	1.1.12
 9422541c5f11969d68f1e995925f0ef5	1.1.13
+b86aca610f6f0763d7ad9ee4d8390c03	1.2.0
diff --git a/version-micro b/version-micro
index 3a2e3f4..573541a 100644
--- a/version-micro
+++ b/version-micro
@@ -1 +1 @@
--1
+0
diff --git a/version-stamps b/version-stamps
index 617adb5..de8da33 100644
--- a/version-stamps
+++ b/version-stamps
@@ -8,3 +8,4 @@ a5ee6f647e6d98d5f06b75a70b7bf9a5	"February 28, 2008"
 7f8612564a03e6cb722e8692027252f2	"March 03, 2008"
 0c169eaf189eb8f9b375254b69e63c31	"March 03, 2008"
 9422541c5f11969d68f1e995925f0ef5	"March 07, 2008"
+b86aca610f6f0763d7ad9ee4d8390c03	"March 11, 2008"
-- 
cgit v1.2.3