From d5ce89148b63d36696dee783a1b7e075489aa21a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 26 Oct 2014 22:43:43 +0000 Subject: [PATCH] Bump version --- ChangeLog | 4 ++++ debian/changelog | 9 ++------- wscript | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07c8218f7..f9cd09676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-26 Carl Hetherington + + * Version 2.0.16 released. + 2014-10-24 Carl Hetherington * 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 Wed, 22 Oct 2014 14:24:53 +0100 -======= - * New upstream release. * New upstream release. - -- Carl Hetherington Fri, 24 Oct 2014 01:19:26 +0100 ->>>>>>> origin/master + -- Carl Hetherington 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') -- 2.30.2