From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Sep 2014 22:30:31 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~601
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6de35d058821acc092d2aae75543024a97026b8a

Merge master.
---

6de35d058821acc092d2aae75543024a97026b8a
diff --cc ChangeLog
index 980bfba88,a529f6a81..89185d4e6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -25,20 -8,12 +25,14 @@@
  
  2014-09-08  Carl Hetherington  <cth@carlh.net>
  
 -	* Fix failure to load Targa files.
 +	* Version 2.0.5 released.
  
- 2014-09-08  Carl Hetherington  <cth@carlh.net>
- 
- 	* Version 1.73.4 released.
 -2014-09-07  Carl Hetherington  <cth@carlh.net>
++	* Fix hidden advanced preferences button in some locales.
  
 -	* Version 1.73.3 released.
 +2014-09-08  Carl Hetherington  <cth@carlh.net>
 +
 +	* Fix failure to load Targa files.
  
- 2014-09-07  Carl Hetherington  <cth@carlh.net>
- 
- 	* Version 1.73.3 released.
- 
  2014-09-07  Carl Hetherington  <cth@carlh.net>
  
  	* Put no stretch / no scale in the set of choices for default
@@@ -46,10 -21,10 +40,6 @@@
  
  	* Fix a few bad fuzzy translations from the preferences dialog.
  
--2014-09-03  Carl Hetherington  <cth@carlh.net>
--
--	* Version 1.73.2 released.
--
  2014-09-03  Carl Hetherington  <cth@carlh.net>
  
  	* Fix server certificate downloads on OS X (#376).