From: Carl Hetherington <cth@carlh.net>
Date: Thu, 6 Oct 2016 23:19:53 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.9.31~3
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a3a38dcdab89d3c7fa21917ea7caec82d1586035

Merge.
---

a3a38dcdab89d3c7fa21917ea7caec82d1586035
diff --cc ChangeLog
index 2ea2697cd,76f4adaa0..34fe178a4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2016-10-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Fix XML subtitle output in some cases.
 +
+ 2016-10-06  c.hetherington  <cth@carlh.net>
+ 
+ 	* Allow selection of CPL in multi-CPL DCPs (#733).
+ 
  2016-10-05  Carl Hetherington  <cth@carlh.net>
  
  	* Updated fr_FR translation from Thierry Journet.