why_not in can_reference can just be a string rather than a list of strings.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e2da549d1ec19360fb6030943ee169a6e4f07665..709ca463acfe1e1a5bb95d8a8a526ddae9e132d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,70 @@
-<<<<<<< HEAD
-2018-03-14  Carl Hetherington  <cth@carlh.net>
-=======
+2018-03-26  Carl Hetherington  <cth@carlh.net>
+
+       * Add real-time mouse cursor readout in audio analysis (rest of #1082)
+
+       * Add time axis to audio analysis (part of #1082).
+
+       * Note: from this point in the ChangeLog release versions
+       are marked using git tags and not written to the ChangeLog.
+
+2018-03-25  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.13.2 released.
+
+2018-03-24  Carl Hetherington  <cth@carlh.net>
+
+       * Fix crash when changing DCP audio channel count (#1253).
+
+       * Fix update checker error when there is no test
+       version.
+
+       * Updated fr_FR translation from Thierry Journet.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Add space shortcut to start/stop playback, arrows to go
+       back/forward one frame and Ctrl-T to open timeline (#1201).
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Allow CPL selection in player (#1239).
+
+       * Add hint about making a DCP with a very different frame rate
+       to the content.
+
+2018-03-21  Carl Hetherington  <cth@carlh.net>
+
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2018-03-19  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.78 released.
+
+2018-03-16  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.77 released.
+
+2018-03-16  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.76 released.
+
+       * Updated de_DE translation from Carsten Kurz.
+
+       * Version 2.12.1 released.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.0 released.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.79 released.
+
 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.