Untested merge of master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f84e5a72fece348e85b785de38f2132f577d6924..ffbbcfb2d7554b82d9c009560b49ae7b59f91b82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+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>
+
+       * Version 0.84beta3 released.
+
+2013-04-19  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.84beta2 released.
+
+2013-04-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.84beta1 released.
+
 2013-04-15  Carl Hetherington  <cth@carlh.net>
 
        * Fix error message on forcing language to English (#103).
@@ -493,7 +525,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>