From 978e33ba253a997b41b331b449b474a5cee7bccc Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Mon, 23 Jan 2012 08:54:31 +0100
Subject: Imported Upstream version 2.1.10

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2349d55..ee15982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,157 @@
 # Generated by Makefile. Do not edit.
 
+commit ab64a395a01293453da606f08e0983ae8bbeb210
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Mon Oct 3 07:24:15 2011 -0500
+
+    Updated news for 2.1.10 release
+
+ NEWS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ddc75f9e54f1fc95a057e935c51c0c22e53df6e7
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Wed Sep 28 08:37:41 2011 -0500
+
+    Applied workaround for issue 261
+
+ NEWS           |    7 ++++---
+ src/kqueue.cpp |    4 +++-
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 80b0041ea1685ed49c222d237b4c9c49bd495b64
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 16 10:33:24 2011 -0500
+
+    Added diagnostics for issue 254
+
+ src/tcp_socket.cpp |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 4fc2b0fee7cd98ef4d1b69ce079539773bb5b76b
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 16 10:33:10 2011 -0500
+
+    Whitespace fixes
+
+ src/tcp_connecter.cpp |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit e7f29bfccb915d129bc55b9ff1b48b1a7c2e6661
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Sep 13 10:15:31 2011 -0500
+
+    Fixed issue 252
+
+ NEWS |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit fffd7701a5bece99767b6e10e2cafbe7670c5f2f
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Sep 13 10:13:52 2011 -0500
+
+    Fixed issue 252
+
+ src/req.cpp |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 3e1aa20233c8bc4d29fecf9e74f6ee6857cdca44
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Sep 6 08:02:27 2011 -0500
+
+    Fixed issue 250
+
+ NEWS       |    2 ++
+ src/ip.cpp |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 930c3ef246a5f2a58a614778a9512d61d222de16
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Sun Sep 4 10:58:07 2011 +0200
+
+    Fixed windows build
+
+ src/err.hpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit afb68fd07be76bd037761d7b54416f7d29255866
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 2 16:09:50 2011 +0200
+
+    Updated NEWS for issue 218
+    
+    Signed-off-by: Pieter Hintjens <ph@imatix.com>
+
+ NEWS |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 3d91c037657c74c79dfa49f1781eb633bf31de98
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 2 16:08:46 2011 +0200
+
+    Fixed issue 218
+    
+    Signed-off-by: Pieter Hintjens <ph@imatix.com>
+
+ src/ip.cpp            |   49 +++++++++++++++++++++++++++++++++++++++----------
+ src/ip.hpp            |    2 ++
+ src/signaler.cpp      |    6 +++---
+ src/tcp_connecter.cpp |    6 +++---
+ src/tcp_listener.cpp  |    2 +-
+ 5 files changed, 48 insertions(+), 17 deletions(-)
+
+commit 9fcbf166da89f73b010950b264f4573b25804e5e
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 2 11:53:25 2011 +0200
+
+    Updated NEWS for issue 140 fix
+
+ NEWS |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 6c07e8d94453fbabe818a639c8d6021aa95f14c4
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Fri Sep 2 11:51:11 2011 +0200
+
+    Fixed issue 140
+
+ src/options.cpp |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 66d69d7d6393d6d097c9a89e20c061e61167a091
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 30 14:09:30 2011 +0200
+
+    Updated for issue 207
+
+ NEWS |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit a41271a0c1840729f4a439b0bd240ca78af04f02
+Merge: c514fb9 81602d4
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 30 13:52:49 2011 +0200
+
+    Merge branch 'issue-207'
+
+commit 81602d41aae0cbc284e3d13d7bd7b30357dd8083
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 30 13:52:42 2011 +0200
+
+    Fixed issue 207
+
+ src/socket_base.cpp |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit c514fb93902fc8f9423d888b5d70bde87b357cd8
+Author: Pieter Hintjens <ph@imatix.com>
+Date:   Tue Aug 30 13:11:12 2011 +0200
+
+    Updated for 2.1.9
+
+ include/zmq.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 commit 392c3771c22d0dfe793cc9c4ee5c27d18d38d428
 Author: Pieter Hintjens <ph@imatix.com>
 Date:   Mon Aug 29 20:25:11 2011 +0200
-- 
cgit v1.2.3