From: Carl Hetherington <cth@carlh.net>
Date: Mon, 12 May 2014 00:00:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~551^2~209
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d50bc4c21be3e0766916b47a6e688cf896bed059

Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
---

d50bc4c21be3e0766916b47a6e688cf896bed059
diff --cc ChangeLog
index 7d31d592a,1a031b445..1fc51803a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2014-05-12  Carl Hetherington  <cth@carlh.net>
 +
 +	* Use libdcp::raw_convert instead of boost::lexical_cast and
 +	LocaleGuard, hopefully to fix large numbers being written with
 +	thousands separators on some locales.
 +
+ 2014-05-10  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.69.2 released.
+ 
  2014-05-10  Carl Hetherington  <cth@carlh.net>
  
  	* Fix setup of the libswresample context to work with high channel counts.