Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c5df3d2cc34956f3e279cad2d90de2a24ec98dca..129d148e9f76e1fb2cd97cf5afaad7557df44255 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.