Fix merge.

diff --git a/ChangeLog b/ChangeLog
index a8b91ec632394d3c8e0680e701a70e2f9fe5852a..9dfed5d601da0f12335deded61856b8d689acdea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.71.1 released.
+
 2014-06-28  Carl Hetherington  <cth@carlh.net>
 
        * Fix crash on analysing audio (and possibly DCP creation) with

diff --git a/debian/changelog b/debian/changelog
index 17f8b311a3147aa49f4206ff2c8bdc68712aa0b4..6538c05ecd542e2ff5e901461200044457662129 100644 (file)
--- 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.

diff --git a/wscript b/wscript
index 9612821a10da50f762e91f067eb37a67df93d385..e89eedbe7fc1d208048bc8a0a45ab066301acf13 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.71.0devel'
+VERSION = '1.71.1devel'
 
 def options(opt):
     opt.load('compiler_cxx')