Preparation for 1.2.0 releasev1.2.0

- version number bumped
- NEWS updated

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

2 files changed, 32 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index df1df50..3933f79 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,37 @@ This file documents the major changes in between releases of Crossroads
 I/O. For a detailed list of changes please refer to Git history, or the
 ChangeLog file included with your distribution of Crossroads.
 
+Release 1.2.0 (13 Jun 2012)
+---------------------------
+
+This release introduces the topic (wildcard) filtering mechanism.
+Aside of that it fixes several problems with 1.1.0.
+
+Backward incompatible changes::
+* xs.h header was moved to xs subdirectory to prevent clash with XenStore
+  header; use #include <xs/xs.h> from now on
+* Expired survey returns ETIMEDOUT instead of EAGAIN
+
+New features::
+* Topic filter implemented
+
+Bugfixes::
+* libzmq and tests MSVC projects added to the distribution
+* Do not crash when multiple peers connect to PAIR socket
+* Opening plug-in directory made more robust
+* Use global event to synchronise signaler creation on Windows
+* Polling on SURVEYOR socket implemented
+* Properly handle infinite timeout in zmq_poll()
+
+Build::
+* Install plugins under $(libdir) to simplify multi-arch packaging
+* Issues a warning on unsupported architectures instead of failing
+* Different minor improvements
+
+Self tests::
+* test for multiple peers on PAIR socket added
+
+
 Release 1.1.0 (12 May 2012)
 ---------------------------
 
diff --git a/include/xs/xs.h b/include/xs/xs.h
index 74d5f34..9759967 100644
--- a/include/xs/xs.h
+++ b/include/xs/xs.h
@@ -56,7 +56,7 @@ extern "C" {
 
 /*  Version macros for compile-time API version detection                     */
 #define XS_VERSION_MAJOR 1
-#define XS_VERSION_MINOR 1
+#define XS_VERSION_MINOR 2
 #define XS_VERSION_PATCH 0
 
 #define XS_MAKE_VERSION(major, minor, patch) \