From: Carl Hetherington <cth@carlh.net>
Date: Sun, 26 Oct 2014 22:43:43 +0000 (+0000)
Subject: Bump version
X-Git-Tag: v2.0.48~534^2~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d5ce89148b63d36696dee783a1b7e075489aa21a

Bump version
---

diff --git a/ChangeLog b/ChangeLog
index 07c8218f7..f9cd09676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-26  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.16 released.
+
 2014-10-24  Carl Hetherington  <cth@carlh.net>
 
 	* Add a pause button for jobs.
diff --git a/debian/changelog b/debian/changelog
index 9087bd105..5dedc91f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.15-1) UNRELEASED; urgency=low
+dcpomatic (2.0.16-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -196,14 +196,9 @@ dcpomatic (2.0.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 <<<<<<< HEAD
-
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 22 Oct 2014 14:24:53 +0100
-=======
-  * New upstream release.
   * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
->>>>>>> origin/master
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 26 Oct 2014 22:43:43 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 0a9e00e9c..91b6e5bd7 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.15devel'
+VERSION = '2.0.16'
 
 def options(opt):
     opt.load('compiler_cxx')