From 6de35e973a23db28f7bca1fd374f3e7413fb4fb3 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Fri, 6 Nov 2015 09:08:58 -0500
Subject: updates

---
 CHANGELOG.md | 31 ++++++++++++++++++++++++++++++-
 config.xml   |  2 +-
 maketag.sh   |  3 +++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100755 maketag.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2a904e4..e8e36093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,41 @@
 # Change Log
 
+## [Unreleased](https://github.com/pliablepixels/zmNinja/tree/HEAD)
+
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.86...HEAD)
+
+**Implemented enhancements:**
+
+- In playback mode, add the ability to swipe to the next event of whichever monitor has the next event and/or initiate gapless playback of same. [\#49](https://github.com/pliablepixels/zmNinja/issues/49)
+- In playback mode, add the ability to swipe to the next event of the same monitor and/or initiate gapless playback. [\#48](https://github.com/pliablepixels/zmNinja/issues/48)
+
+**Fixed bugs:**
+
+- tapping on events before they complete causes issues [\#44](https://github.com/pliablepixels/zmNinja/issues/44)
+
+**Closed issues:**
+
+- If swiping is enabled, don't swipe if image is zoomed in -- causes pan/zoom conflicts [\#66](https://github.com/pliablepixels/zmNinja/issues/66)
+
+## [v0.86](https://github.com/pliablepixels/zmNinja/tree/v0.86) (2015-11-06)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.85...v0.86)
+
+**Implemented enhancements:**
+
+- Make Back button to exit from live view [\#61](https://github.com/pliablepixels/zmNinja/issues/61)
+- ability to run all screens of zmNinja on a desktop without console errors [\#59](https://github.com/pliablepixels/zmNinja/issues/59)
+
+**Closed issues:**
+
+- getDiskStatus seems to be a performance bottleneck - disable for now in System State screen [\#65](https://github.com/pliablepixels/zmNinja/issues/65)
+- clean up non-reachable code during portal check [\#64](https://github.com/pliablepixels/zmNinja/issues/64)
+
 ## [v0.85](https://github.com/pliablepixels/zmNinja/tree/v0.85) (2015-11-01)
 [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.84...v0.85)
 
 **Implemented enhancements:**
 
 - video branch support for zmNinja  [\#60](https://github.com/pliablepixels/zmNinja/issues/60)
-- ability to run all screens of zmNinja on a desktop without console errors [\#59](https://github.com/pliablepixels/zmNinja/issues/59)
 - changing servers requires reload of monitors - should be automatically done [\#58](https://github.com/pliablepixels/zmNinja/issues/58)
 
 **Fixed bugs:**
diff --git a/config.xml b/config.xml
index f836770f..134cbae3 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.pliablepixels.zmninja" version="0.85.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.pliablepixels.zmninja" version="0.86" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
diff --git a/maketag.sh b/maketag.sh
new file mode 100755
index 00000000..4317ff70
--- /dev/null
+++ b/maketag.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+git tag -a v$1 -m'v$1'
+git push origin $1
-- 
cgit v1.2.3