Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5c352286996ba8c76ce09c5fd3e69f73c0d74413..c989f549f8cb4636afc981e5c8bf5e4834975f15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-04-29  Carl Hetherington  <cth@carlh.net>
 
+       * Allow configuration of the encryption key (from master).
+
        * Various fixes to bad timeline drag behaviour when
        snapping (from master).