From: Carl Hetherington <cth@carlh.net>
Date: Fri, 27 Jun 2014 12:28:08 +0000 (+0100)
Subject: Merge 1.70.0-hotfix branch into master.
X-Git-Tag: v2.0.48~551^2~29
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=af2dfe1cbabaa3c1fb663063a1f9778858255818

Merge 1.70.0-hotfix branch into master.
---

af2dfe1cbabaa3c1fb663063a1f9778858255818
diff --cc ChangeLog
index 14032c101,65bfbe538..a417575e5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,13 +1,24 @@@
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.71.0 released.
+ 
+ 2014-06-27  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix up/down buttons in content list.
+ 
  2014-06-26  Carl Hetherington  <cth@carlh.net>
  
 +	* Version 1.70.1 released.
 +
 +2014-06-26  Carl Hetherington  <cth@carlh.net>
 +
 +	* Support different KDM formulations.
 +
 +	* Allow override of detected video frame rates.
 +
 +	* Optimisation of uncertain effect to encoder and server
 +	thread handling.
 +
  	* Version 1.70.0 released.
  
  2014-06-25  Carl Hetherington  <cth@carlh.net>
diff --cc debian/changelog
index 7a38ec535,872bd18ad..2cb6795fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -164,7 -164,7 +164,11 @@@ dcpomatic (1.71.0-1) UNRELEASED; urgenc
    * 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