Fix merge.

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a8b91ec63..9dfed5d60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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
 	resampled content.
 
diff --git a/debian/changelog b/debian/changelog
index 17f8b311a..6538c05ec 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.
diff --git a/wscript b/wscript
index 9612821a1..e89eedbe7 100644
--- 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')