Forward-port tweaks to content buttons from 1.x.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 07c8218f763c61acf8dc53a64619f76d56f2527c..d96a2dcd731a398f47cef29105b0e5ca20bb7997 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-10-30  Carl Hetherington  <cth@carlh.net>
+
+       * Fix mis-merge causing complete breakage
+       of the main window.
+
+2014-10-28  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.18 released.
+
+2014-10-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.17 released.
+
+2014-10-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.16 released.
+
 2014-10-24  Carl Hetherington  <cth@carlh.net>
 
        * Add a pause button for jobs.