X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=4e411a750731a7915db595725a2542a3e48d6de1;hb=42a3da099dc91e3b11746c3c76611fc19a887955;hp=fb526efd192e0ff0db1b90b40c512cfa6a2f8671;hpb=a25cdee1b5b9deaa4414c7f1ddac3f55c03227c1;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index fb526efd1..4e411a750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,68 @@
+2013-05-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.89 released.
+
+2013-05-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.89beta1 released.
+
+2013-05-04  Carl Hetherington  <cth@carlh.net>
+
+	* Very simple batch converter added (#127).
+
+	* Add preference for CPL issuer and creator (#122).
+
+	* Add preference for default format and DCP content
+	type (#133).
+
+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.
+
+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, and previous/next
+	frame buttons.
+
 	* Version 0.84beta4 released.
 
 2013-04-19  Carl Hetherington  <cth@carlh.net>
@@ -509,7 +572,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>