From: Carl Hetherington <cth@carlh.net>
Date: Sat, 5 Apr 2014 16:05:51 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.0.48~878
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2c0478d2b33906845b9d910668b12fe3e8f03a7c

Merge.
---

2c0478d2b33906845b9d910668b12fe3e8f03a7c
diff --cc ChangeLog
index 1d3ee28fa,73236be9b..7fbd78e59
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-04-02  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.66.10 released.
+ 
  2014-04-01  Carl Hetherington  <cth@carlh.net>
  
  	* Basic support for separate left/right-eye files or directories