From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 Oct 2014 22:02:35 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~556
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=12efbd5938f08eb445b43f539fa4f27aa5caccfb

Merge master.
---

12efbd5938f08eb445b43f539fa4f27aa5caccfb
diff --cc ChangeLog
index c9ebcfb8b,047628602..fce782d7a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,28 +1,57 @@@
 +2014-10-05  Carl Hetherington  <cth@carlh.net>
 +
 +	* Use a more sensible default position and size for
 +	.srt subs.
 +
+ 2014-10-08  c.hetherington  <cth@carlh.net>
+ 
+ 	* Make server finding more reliable when
+ 	there are more than a few servers.
+ 
 +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.
+ 
+ 2014-10-08  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.74.1 released.
+ 
+ 2014-10-05  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Bump ffmpeg version.
+ 
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.74.0 released.
+ 
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.73.9 released.
+ 
  2014-09-28  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.73.8 released.