summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
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>