Merge master; fix crash on new film.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 12890135c94c5581a3c7ff66a8c1c2845f320167..c5df3d2cc34956f3e279cad2d90de2a24ec98dca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,36 @@
+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.
+
+2013-04-20  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bad saving of metadata in locales which use
+       commas to separate decimals (#119).
+
 2013-04-19  Carl Hetherington  <cth@carlh.net>
 
-       * Add basic frame index and timecode to viewer (part of #68).
+       * Add basic frame index and timecode to viewer, and previous/next
+       frame buttons.
 
        * Version 0.84beta4 released.
 
@@ -511,7 +541,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>