From d43aadb0bbb5cbdebbc5c95cb3065ed0aa49296a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 29 Apr 2015 15:22:29 +0100
Subject: Hand-apply 077d2abb480a883119783db3f957f175e22e543b from master; stop
 more flickering when dragging in the timeline in OS X.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 183ebc341..c6ba37bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
-- 
cgit v1.2.3