Bump version

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 2cb6795fa2c6ed5bdb2776850297696b9be41599..b69567a2d853623a235a0397c343012eb8f38bc2 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.
@@ -164,11 +164,9 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
 
-<<<<<<< HEAD
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
-=======
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 27 Jun 2014 13:25:44 +0100
->>>>>>> 1.70.0-hotfix
+<<<<<<< HEAD  * New upstream release.
+
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Jun 2014 00:53:18 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 9612821a10da50f762e91f067eb37a67df93d385..c497c9371406d87b4cc064b598f38205561780e0 100644 (file)
--- 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')