Hand-apply b737b25e10a4bcfb8cb645e95a089192347b4805 from master; more deflickering.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d7e922935741719918e52dfe059d4f39f88077b1..84deaaffe745962c350f1b80f019e31104ba59d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
+2015-04-29  c.hetherington  <cth@carlh.net>
+
+       * Hand-apply 291179175729b62e17a9c322cd27ae134d1310d9 and
+       8d92cce7d2885afa13ee4cb6f546dbf43942124b 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.
+
+       * Hand-apply all changes relating to colour specification
+       as chromaticity.
+
 2015-04-20  Carl Hetherington  <cth@carlh.net>
 
+       * Hand-apply 47770097cf6a5d7dbbdded8977da5f3de53dfd33;
+       single-file hashes.
+
        * Hand-apply e1d0d24146592e311d46781a1961fe080f6357cf;
        attempt to fix confusion with the JPEG2000 bandwidth
        control when a user enters a value directly rather than