Hand-apply a2f776bd239ef1a744c1a9fea841ac0a51c4f33b from master; more deflickering.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 84deaaffe745962c350f1b80f019e31104ba59d2..d9375527ccf8274c296d2dc61d13df273e4f45ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2015-04-29  c.hetherington  <cth@carlh.net>
 
-       * Hand-apply 291179175729b62e17a9c322cd27ae134d1310d9 and
-       8d92cce7d2885afa13ee4cb6f546dbf43942124b from master;
+       * 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>