Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b24adacb90e27945cce0cb715ab4b9d8950da907..78954c82da4b1fe42918bf5e7af6ddcc255d87ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+2014-06-03  Carl Hetherington  <cth@carlh.net>
+
+       * 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.