From 03e9c45059dd22af4dee521b2a42925b9dacba16 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Mon, 25 May 2015 15:46:59 +0200
Subject: [PATCH] updated to new version 1.2.0

---
 ChangeLog.md | 7 ++++++-
 VERSION      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 47e28413..b7294c3d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,12 +1,17 @@
-# next version (2015-05-?)
+# 1.2.0 (2015-05-25)
 
 ## Bug fixes
 * corrected missing newline in ebusctl
 * avoid updating last message change time when only the querying master was modified
+* notify running requests on device error
 
 ## Features
 * new command line option "--readonly" for read-only access to the bus
 * added support for retrieving data as JSON and additional files via optional HTTP port
+* added first version of static HTML user interface (to be extended to a dynamic one later)
+* new "read" option "-h" for sending hex read messages
+* new "read" option "-p PRIO" for setting the poll priority of a message
+* update cache on hex read or write
 
 ## Changed files
 https://github.com/john30/ebusd/compare/v1.1.0...master
diff --git a/VERSION b/VERSION
index 9084fa2f..26aaba0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0