Untested merge of master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4caba4a856a556254091f77b6dd3f19df7c82429..ffbbcfb2d7554b82d9c009560b49ae7b59f91b82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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 +525,6 @@
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.65 released.
->>>>>>> master
 
 2012-12-13  Carl Hetherington  <cth@carlh.net>