X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=17ffca9660d65de381f1faaa5824cfd68188d12a;hb=7278bc78ef3adec819e6b811dd02b8883769cfbb;hp=ff2b607e9dd2b0b90c993226a34dbcbe4dd21baa;hpb=e1a7890c6cee31ebbd55e5209cd14bb3b9b93bf0;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index ff2b607e9..17ffca966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,92 @@
-<<<<<<< HEAD
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.33 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.32 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.31 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.30 released.
+
+2015-01-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.29 released.
+
+2015-01-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.28 released.
+
+2015-01-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.27 released.
+
+2015-01-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.26 released.
+
+2015-01-04  Carl Hetherington  <cth@carlh.net>
+
+	* Fix loading of SMPTE XML subtitles which
+	are not MXF-wrapped.
+
+2014-12-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.25 released.
+
+2014-12-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.24 released.
+
+2014-12-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.23 released.
+
+2014-12-11  Carl Hetherington  <cth@carlh.net>
+
+	* Add a language property to subtitle content and use it
+	for the DCP subtitle's language specification.
+
+2014-11-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.22 released.
+
+2014-11-24  Carl Hetherington  <cth@carlh.net>
+
+	* Allow import of J2K image sequences.
+
+2014-11-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.21 released.
+
+2014-11-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.20 released.
+
+2014-11-10  Carl Hetherington  <cth@carlh.net>
+
+	* Guess initial scale from the size of video
+	content images, taking pixel aspect ratio into
+	account where possible.
+
+2014-11-07  c.hetherington  <cth@carlh.net>
+
+	* Add a hint if there is 3D content in a proposed 2D DCP.
+
+2014-11-06  Carl Hetherington  <cth@carlh.net>
+
+	* Basic support for emailing a report of
+	a problem (#43).
+
+2014-11-05  c.hetherington  <cth@carlh.net>
+
+	* Add a few more hints.
+
 2014-10-30  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.19 released.
@@ -15,12 +103,11 @@
 2014-10-26  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.17 released.
-=======
+
 2014-11-02  Carl Hetherington  <cth@carlh.net>
 
 	* Be more tolerant of some FFmpeg audio decoding errors;
 	should fix #352.
->>>>>>> fc8fb8f... Process decoded audio even if avcodec_decode_audio4 returns an error, as there are cases where it produces good data and then returns an error.
 
 2014-10-26  Carl Hetherington  <cth@carlh.net>