Merge master.

1 files changed, 27 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 053c1f106..07c8218f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2014-10-24  Carl Hetherington  <cth@carlh.net>
+
+	* Add a pause button for jobs.
+
+	* Experimental support for bypassing colourspace conversion (#266).
+
+	* Version 1.76.6 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.76.5 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.76.4 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Rename 'Add folder' to 'Add image sequence'
+	and add some tooltips.
+
+	* Move the "keep video in sequence" button into
+	the timeline dialogue.
+
+	* Fix mix-placement of content when using the "Down"
+	button to move it.
+
 2014-10-22  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.15 released.