From 5b42f3609c0b076cca6605261d0cdc6463faaa61 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Thu, 19 Jan 2012 14:25:34 +0100
Subject: [PATCH] Update Changelog to reflect changes between 1.2rc1 and 1.2

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bc03799ac5..b594dd5965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1.2 -- 2012-01-19
+
+- improved Windows/CYGWIN path handling (#387)
+- fixed some issues with passing an interface or ip address with -i
+- make live worker runmode threads adhere to the 'detect' cpu affinity settings
+
 1.2rc1 -- 2012-01-11
 
 - app-layer-events keyword: similar to the decoder-events and stream-events, this will allow matching on HTTP and SMTP events