Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b584a6c7c64154b680950dbf3ff2c24ba1e33e8d..36a282919097ce8a2bd73f110cf54f7af97bb105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-31  Carl Hetherington  <cth@carlh.net>
+
+       * Give a hint when content and container aspect ratios are not
+       the same (#392).
+
+       * Add "copy" button to colour conversion presets editor (#399).
+
+       * Allow drag-and-drop of files onto the content list (#395).
+
 2014-08-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.4 released.