X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=c4c2c9c631dca1cbd6b2a0f55474a3b8c0920b23;hb=48b2c7b8ec57e72f2f27d5080e54e4b3c3fcda3d;hp=6783464c64c2c89e1a601e383f08f9678ca723cc;hpb=6deca3038ff7a9f2067ff266a21133e8181c56ce;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 6783464c6..c4c2c9c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-17  Carl Hetherington  <cth@carlh.net>
+
+	* Improve appearance of config dialog on OS X.
+
 2014-03-15  Carl Hetherington  <cth@carlh.net>
 
 	* Improve appearance of new film and KDM dialogs on OS X.
@@ -12,7 +16,6 @@
 2014-03-12  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.1 released.
->>>>>>> 80faa28d7fd23ad811a9b837622f7e0cff1f2335
 
 2014-03-12  Carl Hetherington  <cth@carlh.net>