Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4caba4a856a556254091f77b6dd3f19df7c82429..5d4d60c98e524f0e1f5f66891c16245caf86ac8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2013-04-28  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.88 released.
+
+2013-04-28  Carl Hetherington  <cth@carlh.net>
+
+       * Fix broken external audio support.
+
+2013-04-24  Carl Hetherington  <cth@carlh.net>
+
+       * Allow use of existing empty directories for new films (without
+       confirmation) and existing non-empty directories (with confirmation)
+       (#124).
+
+2013-04-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.87 released.
+
+2013-04-26  Carl Hetherington  <cth@carlh.net>
+
+       * Make new trim options actually work (#121).
+
+2013-04-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.86 released.
+
+2013-04-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.85 released.
+
+2013-04-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.84 released.
+
 2013-04-21  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.84beta5 released.
@@ -521,7 +555,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>