Bump version

diff --git a/ChangeLog b/ChangeLog
index 07c8218f763c61acf8dc53a64619f76d56f2527c..f9cd0967656d04fcc6f0078517fa9e890203b6b0 100644 (file)
--- 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 9087bd1051a832f11a1182d21c1fc22c8ea2229b..5dedc91f00ce991f4799fc5bd4d340349898bd65 100644 (file)
--- 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 0a9e00e9c8d57b79be76c8edc585cb9820ebe054..91b6e5bd7b9f8f18816c1a20540acf970630f7f5 100644 (file)
--- 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')