Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 07c985c47b7aa4c842c97ef8f5652bf42cafb64d..78954c82da4b1fe42918bf5e7af6ddcc255d87ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
 2014-06-03  Carl Hetherington  <cth@carlh.net>
 
-       * Re-calculate audio plots when the mapping is changed.
+       * Fix bad resampling of separate sound file sources that
+       have specified video frame rates.
+
+       * Version 1.69.20 released.
+
+2014-06-03  Carl Hetherington  <cth@carlh.net>
+
+       * Re-calculate and update audio plots when the mapping is changed.
+
+       * Change the -3dB preset to -6dB since we are talking about
+       amplitude, not power.
 
        * Version 1.69.19 released.