Hand-apply 077d2abb480a883119783db3f957f175e22e543b from master; stop more flickering...

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index cc41dab424df21fc3d882e453acb9c2771428d57..c6ba37bdf5ac8f41d1bf58680df53d0bc4110cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2015-04-29  c.hetherington  <cth@carlh.net>
+
+       * Hand-apply 291179175729b62e17a9c322cd27ae134d1310d9 from master;
+       stop more 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
+       using the spin arrows.
+
+2015-04-16  Carl Hetherington  <cth@carlh.net>
+
+       * Fix potential OS X crashes due to another incarnation
+       of the bizarre multi-thread stringstream bug.
+
 2015-04-15  c.hetherington  <cth@carlh.net>
 
        * Hand-apply 94998e12d117f3f1781dfb1318939debfbf34546 from master;