From 78995951aecca3ca200f2ccbd0abd2bdb64e8106 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Sun, 30 Aug 2015 18:19:22 +0200
Subject: [PATCH] Update ChangeLog and bump version for v1.2.2 release.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 CHANGELOG.md | 16 ++++++++++++++++
 Makefile     |  2 +-
 README.md    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27a33c6..ff4580e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v1.2.2] - 2015-08-30
+---------------------
+
+Minor bugfix release.
+
+### Changes
+- The `ifdef STATIC` in the Makefile has been removed.  Now both the
+  .a and .so libraries are built.  The user may then select what to
+  install.  This is a change for convenience when using libuEv from
+  a GNU Configure & Build based project.
+
+### Fixes
+- Fix odd data ordering issue on Debian Jessie in new `uev_private_t`
+- Fix issue #6: Segfault when stopping timer before calling `uev_exit()`
+
+
 [v1.2.1] - 2015-07-02
 ---------------------
 
diff --git a/Makefile b/Makefile
index b19efe6..791ae86 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@
 ROOTDIR    ?= $(shell pwd)
 
 #VERSION    = $(shell git tag -l | tail -1)
-VERSION    ?= 1.2.1
+VERSION    ?= 1.2.2
 NAME        = libuev
 PKG         = $(NAME)-$(VERSION)
 ARCHIVE     = $(PKG).tar.xz
diff --git a/README.md b/README.md
index 4911453..36addc1 100644
--- a/README.md
+++ b/README.md
@@ -293,7 +293,7 @@ used for inspiration is the very small [Picoev][9] by [Oku Kazuho].
 [Flemming Madsen]: http://www.madsensoft.dk
 [Dave Zarzycki, Apple]: http://www.youtube.com/watch?v=cD_s6Fjdri8
 
-[libuEv] is developed and maintained by [Joachim Nilsson]
+[libuEv] is developed and maintained by [Joachim Nilsson].
 
 <!--
   -- Local Variables: