X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=6f31dd5d24fbcd839fa07968a0e32c77d0e27977;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=7fbd78e59cfa32b5d2570faa27616a04226413a2;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 7fbd78e59..6f31dd5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,148 @@
 
 	* Add subtitle view.
 
+2014-05-19  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.9 released.
+
+2014-05-19  Carl Hetherington  <cth@carlh.net>
+
+	* Decode image sources in the multi-threaded part
+	of the transcoder, rather than the single-threaded.
+
+2014-05-16  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.8 released.
+
+2014-05-16  Carl Hetherington  <cth@carlh.net>
+
+	* Fix various confusions in translations of abbreviated
+	channel names (Lc, Rc etc.)
+
+2014-05-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.7 released.
+
+2014-05-14  Carl Hetherington  <cth@carlh.net>
+
+	* Bump libdcp to remove checks on PCM MXF edit rates,
+	so we can generate strange ones in DCP-o-matic.
+
+2014-05-13  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.6 released.
+
+2014-05-13  Carl Hetherington  <cth@carlh.net>
+
+	* Remove artificial 100fps limit when using
+	"any" DCP frame rate.
+
+2014-05-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.5 released.
+
+2014-05-12  Carl Hetherington  <cth@carlh.net>
+
+	* Add option to use any DCP frame rate, rather than just
+	the "allowed" set.
+
+	* Version 1.69.4 released.
+
+2014-05-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.3 released.
+
+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.
+
+2014-05-09  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.1 released.
+
+2014-05-09  Carl Hetherington  <cth@carlh.net>
+
+	* Fix crash on using content with more than 12 audio channels.
+
+	* Re-introduce ffprobe call when adding content.
+
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.0 released.
+
+2014-05-02  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.68.0 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.67.1 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.67.0 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.16 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Add .dpx to the list of acceptable image files.
+
+	* Slightly better handling of uncaught exceptions.
+
+	* Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
+	it appears that the same bug remains.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.15 released.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+	* Fix subtitle display when the next subtitle is decoded before the previous
+	one has finished.
+
+2014-04-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.14 released.
+
+2014-04-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.13 released.
+
+2014-04-21  Carl Hetherington  <cth@carlh.net>
+
+	* Update to es_ES translation from Manuel AC.
+
+	* Update to fr_FR translation from Thierry Journet.
+
+2014-04-17  Carl Hetherington  <cth@carlh.net>
+
+	* Fix update of the gain control when using the gain calculator
+	dialog.
+
+	* Version 1.66.12 released.
+
+2014-04-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.11 released.
+
+2014-04-07  Carl Hetherington  <cth@carlh.net>
+
+	* Updated fr_FR translation from Thierry Journet. 
+
 2014-04-02  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.10 released.
@@ -58,7 +200,6 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
->>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>