Fix merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b540313a3744025ec5cdc4557311c57d41f72bcd..0b93c2ac38f0e2521c7d9bfd2f66272c28612190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,26 @@
        * Make the examination of content for length optional, so that
        if a source file has an accurate header you can trust it.
 
+2012-12-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.67 released.
+
+2012-12-18  Carl Hetherington  <cth@carlh.net>
+
+       * Support non-planar float and signed
+       16-bit planar audio; be less
+       crashy when unsupported audio formats
+       are found.
+
+2012-12-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.66 released.
+
+2012-12-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.65 released.
+>>>>>>> master
+
 2012-12-13  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.64 released.