Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b104615e8cba8bd66f58fd006e0eaca1472fd2db..96307028bd8fd383403def21612bfa197e9030f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,34 @@
+2014-11-06  Carl Hetherington  <cth@carlh.net>
+
+       * Basic support for emailing a report of
+       a problem (#43).
+
+2014-11-05  c.hetherington  <cth@carlh.net>
+
+       * Add a few more hints.
+
+2014-10-30  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.19 released.
+
+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-11-02  Carl Hetherington  <cth@carlh.net>
+
+       * Be more tolerant of some FFmpeg audio decoding errors;
+       should fix #352.
+
 2014-10-26  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.16 released.