summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-29 22:10:50 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-29 22:10:50 +0100
commitb4e9d90b9d83c952563ccabc435a5d4310ee4853 (patch)
tree2eddd6bab831528fce9c93a57f09ae61a44fe69a /ChangeLog
parentd43aadb0bbb5cbdebbc5c95cb3065ed0aa49296a (diff)
Hand-apply b737b25e10a4bcfb8cb645e95a089192347b4805 from master; more deflickering.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c6ba37bdf..84deaaffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +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.
+ * 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>