From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Oct 2014 08:34:46 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~555
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e491397c0028a80ac4a48a92007f783746553c1a

Merge master.
---

e491397c0028a80ac4a48a92007f783746553c1a
diff --cc ChangeLog
index fce782d7a,82ee2675e..0d2b89a59
--- a/ChangeLog
+++ b/ChangeLog
@@@ -8,30 -7,6 +7,35 @@@
  	* Make server finding more reliable when
  	there are more than a few servers.
  
++2014-10-05  Carl Hetherington  <cth@carlh.net>
++
++	* Use a more sensible default position and size for
++	.srt subs.
++
 +2014-10-03  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.14 released.
 +
 +2014-10-01  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.13 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.12 released.
 +
 +2014-09-30  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add basic video fade in/out.
 +
 +2014-09-22  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.11 released.
 +
 +2014-09-18  Carl Hetherington  <cth@carlh.net>
 +
 +	* Version 2.0.10 released.
 +
  2014-10-08  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.74.2 released.