Merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 729a335def35e801d57578088cff62afa732ec22..440434d5ea3c19509c3d205cca429eb6dc4c56da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.