Bump version

3 files changed, 9 insertions, 7 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 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 <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 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')