From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 Jan 2014 23:18:10 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.0.48~921^2~15
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=c758226b90f22b553725df2c7be4a3a42772ae54;p=dcpomatic.git

Merge.
---

c758226b90f22b553725df2c7be4a3a42772ae54
diff --cc ChangeLog
index 3e9b9fe58,e73ad8ab2..f1fbcfd23
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,19 +1,21 @@@
 -2014-01-11  Carl Hetherington  <cth@carlh.net>
 +2014-01-12  Carl Hetherington  <cth@carlh.net>
  
 +	* Fix crashes when using -3dB options in locales with a , decimal separator.
++	
+ 	* Version 1.62.3 released.
+ 
+ 2014-01-11  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Hopefully fix error on restarting a cancelled transcode job
+ 	on Windows.
+ 
+ 2014-01-10  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.62.2 released.
+ 
+ 2014-01-10  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.62.1 released.
  
  2014-01-10  Carl Hetherington  <cth@carlh.net>