Merge branch 'master' into windows-debug

1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 93eed7658..212847438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-06  Carl Hetherington  <cth@carlh.net>
+
+	* Remove seemingly unnecessary checks on image directories.
+
+	* Leave DCP directory creation until the last minute to help
+	avoid half-eaten directories being left around (#174).
+
 2014-01-05  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.57 released.