From b33bcfee3b1d222cf12d57563776b9f9ceb3a4a9 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gjasny@googlemail.com>
Date: Sun, 5 Oct 2014 16:57:38 +0200
Subject: [PATCH] Prepare for 1.6.0 release

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 ChangeLog    | 11 +++++++++++
 configure.ac |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b208ef268..d0aa598ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+v4l-utils-1.6.0
+---------------
+
+Gregor Jasny (5):
+      man: Fix typo in dvb-fe-tool man page
+      man: Replace hyphen with minus sign
+      man: place escape to correct position
+      man: Use Unicode character for ellipsis and fall back to ...
+      qv4l2: Add keywords to desktop file
+
+
 v4l-utils-1.5.91 (Development snapshot)
 ---------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 6b88b5971..71bd32380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([v4l-utils],[1.5.91])
+AC_INIT([v4l-utils],[1.6.0])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-- 
GitLab