Bump version

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ff2b607e9dd2b0b90c993226a34dbcbe4dd21baa..35c7bfa125db3c449f7791829c5783bdbd3db639 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,55 @@
-<<<<<<< HEAD
+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 +66,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>