From: Carl Hetherington <cth@carlh.net>
Date: Thu, 24 Jan 2013 15:16:30 +0000 (+0000)
Subject: Merge in 0.70 branch with 0.71 fix.
X-Git-Tag: v2.0.48~1337^2~705^2~12
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=71ea64782f215c605877f5c231a2a8b1838fe8bd

Merge in 0.70 branch with 0.71 fix.
---

71ea64782f215c605877f5c231a2a8b1838fe8bd
diff --cc ChangeLog
index 36bda83b4,4d1fe3423..56a380402
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,11 +1,33 @@@
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 0.71 released.
+ 
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix lack of audio with trimmed DCPs.
+ 
 +2013-01-23  Carl Hetherington  <cth@carlh.net>
 +
 +	* Remove multi-reel support (for now); needs more thinking about
 +	and testing.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.71beta2 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 0.71beta1 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Untested support for splitting DCPs
 +	into multiple reels.
 +
 +2013-01-09  Carl Hetherington  <cth@carlh.net>
 +
 +	* Try to build with 0.10.4-ish ffmpeg.
 +
  2013-01-07  Carl Hetherington  <cth@carlh.net>
  
  	* Version 0.70 released.
diff --cc debian/changelog
index b8385a4b0,7bace15d1..b051ced3a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,16 @@@
- dvdomatic (0.71beta2-1) UNRELEASED; urgency=low
+ dvdomatic (0.71-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 11:36:04 +0000
+ 
+ dvdomatic (0.70-1) UNRELEASED; urgency=low
  
    * New upstream release.
 +  * New upstream release.
 +  * New upstream release.
  
 - -- Carl Hetherington <carl@houllier.lan>  Mon, 07 Jan 2013 23:57:26 +0000
 + -- Carl Hetherington <cth@carlh.net>  Sat, 12 Jan 2013 23:07:15 +0000
  
  dvdomatic (0.70beta3-1) UNRELEASED; urgency=low