Merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index faba489d4327654300db3259f4c996108325325b..e2da549d1ec19360fb6030943ee169a6e4f07665 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+<<<<<<< HEAD
+2018-03-14  Carl Hetherington  <cth@carlh.net>
+=======
+2018-03-21  Carl Hetherington  <cth@carlh.net>
+
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2018-03-19  Carl Hetherington  <cth@carlh.net>
+>>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk.
+
+       * Better error when loading a non-certificate as a certificate.
+
+       * Very basic DCP verification option in the player.
+
+2018-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bad DCPs when re-making in encrypted projects (#1232).
+
+2018-03-02  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bad Prores exports in some cases (#1227).
+
+2018-02-27  Carl Hetherington  <cth@carlh.net>
+
+       * Add a hint about the stereo-to-5.1 upmixers being
+       `experimental'.
+
+2018-02-25  Carl Hetherington  <cth@carlh.net>
+
+       * Updated es_ES translation from Manuel AC.
+
+       * Handle errors in subtitle XML better (#1209).
+
+2018-02-24  Carl Hetherington  <cth@carlh.net>
+
+       * Updated fr_FR translation from Thierry Journet.
+
+2018-02-12  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.55 released.
+
+2018-02-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.54 released.
+
+2018-02-10  Carl Hetherington  <cth@carlh.net>
+
+       * Use a different way of getting frame rate from video content; may
+       fix #1030.
+
+       * Version 2.11.53 released.
+
 2018-02-09  Carl Hetherington  <cth@carlh.net>
 
        * Always pre-roll when seeking in DCPs (#1085).