From f7365c85bd4169df2c2d4e9e8cb3bf51c4b4f3be Mon Sep 17 00:00:00 2001
From: Harry Jeffery <harry@exec64.co.uk>
Date: Fri, 11 Dec 2015 15:46:17 +0000
Subject: Release v1.2.0

---
 CHANGELOG | 12 ++++++++++++
 Makefile  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9a7389f..b97d9e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 imv Changelog
 =============
 
+v1.2.0 - 2015-12-11
+
+* Added a text overlay (-d to enable, 'd' to toggle)
+  - Font used is configurable with -e option
+* Added slideshow support (-t option)
+* Added -l option to list all open images on exit
+* Automatically reload images if they change on disk
+* Moved image loading into background thread to improve UI responsiveness
+* Auto hide the mouse when appropriate
+* Added support for upper and lower case hex in the -b option.
+* Fixed a couple of crashes
+
 v1.1.0 - 2015-11-14
 -------------------
 
diff --git a/Makefile b/Makefile
index c3533ea..e27abc8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SOURCES = $(wildcard src/*.c)
 OBJECTS = $(patsubst src/%.c,$(BUILDDIR)/%.o,$(SOURCES))
 TESTS = $(patsubst test/%.c,test_%,$(wildcard test/*.c))
 
-VERSION = "v1.1.0"
+VERSION = "v1.2.0"
 
 CFLAGS += -DIMV_VERSION=\"$(VERSION)\"
 
-- 
cgit v1.2.3