Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ee4792c9fc36ee3dad671e8e4be1d4eda00dfc8f..662983a74a4598610f8752a66c8dc5d800c8c61c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+2014-05-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.2 released.
+
+2014-05-10  Carl Hetherington  <cth@carlh.net>
+
+       * Fix setup of the libswresample context to work with high channel counts.
+
+2014-05-09  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.1 released.
+
+2014-05-09  Carl Hetherington  <cth@carlh.net>
+
+       * Fix crash on using content with more than 12 audio channels.
+
+       * Re-introduce ffprobe call when adding content.
+
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.0 released.
+
+2014-05-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.68.0 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.67.1 released.
+
 2014-04-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.67.0 released.