Merge 1.70.0-hotfix branch into master.

[dcpomatic.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7a38ec535fbcd49f43f487d721a886bbc7b91c6f..2cb6795fa2c6ed5bdb2776850297696b9be41599 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.70.1-1) UNRELEASED; urgency=low
+dcpomatic (1.71.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -164,7 +164,11 @@ dcpomatic (1.70.1-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
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low