From 2a49c354ef9037ef15ad4e4305e749758a97d7b6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:53:18 +0100 Subject: [PATCH] Bump version --- ChangeLog | 4 ++++ debian/changelog | 10 ++++------ wscript | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8b91ec63..9dfed5d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-28 Carl Hetherington + + * Version 1.71.1 released. + 2014-06-28 Carl Hetherington * Fix crash on analysing audio (and possibly DCP creation) with diff --git a/debian/changelog b/debian/changelog index 2cb6795fa..b69567a2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.71.0-1) UNRELEASED; urgency=low +dcpomatic (1.71.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -164,11 +164,9 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. -<<<<<<< HEAD - -- Carl Hetherington Thu, 26 Jun 2014 19:30:39 +0100 -======= - -- Carl Hetherington Fri, 27 Jun 2014 13:25:44 +0100 ->>>>>>> 1.70.0-hotfix +<<<<<<< HEAD * New upstream release. + + -- Carl Hetherington Sat, 28 Jun 2014 00:53:18 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 9612821a1..c497c9371 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.0devel' +VERSION = '1.71.1' def options(opt): opt.load('compiler_cxx') -- 2.30.2