Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 65fc1e9c49255c759bb249760265239bbceaee9c..1667f599d0bc3169858ad9bfb09a3bbaf35ec43a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2019-01-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.16 released.
+
+2019-01-15  Carl Hetherington  <cth@carlh.net>
+
+       * Add --encrypt/-e option to dcpomatic_create.
+
+       * Fix crash in dcpomatic2_create when using templates.
+
+2018-12-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.15 released.
+
+2018-12-19  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.14 released.
+
+2018-10-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.13 released.
+
 2018-10-08  Carl Hetherington  <cth@carlh.net>
 
        * Fix bad parsing of ASS lines embedded into FFmpeg files
@@ -7,10 +29,6 @@
 
        * Version 2.12.12 released.
 
-2018-09-16  Carl Hetherington  <cth@carlh.net>
-
-       * Add option to open a DCP in the player (#1312).
-
 2018-06-08  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.12.11 released.