X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=c989f549f8cb4636afc981e5c8bf5e4834975f15;hb=a85c82137ec26124ebefccb4aeebb96a3cdb8a4c;hp=183ebc3418afb41b62c099eb441af600614da073;hpb=de55fefe3f977a3552e95400c0e9f5183c14a181;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 183ebc341..c989f549f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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).
+
+2015-04-29  c.hetherington  <cth@carlh.net>
+
+	* Hand-apply 291179175729b62e17a9c322cd27ae134d1310d9,
+	8d92cce7d2885afa13ee4cb6f546dbf43942124b and
+	c994839239e84a1f62865ed82fdc090900a66b03 from master;
+	stop flickering when dragging in the timeline on OS X.
+
 2015-04-22  c.hetherington  <cth@carlh.net>
 
 	* Add P3 colour conversion preset.