Hand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a528dd82798038073ce7c48337d6cb3d1a581cac..5d0338bc2d4070abc45bf7397fbbc767d92f822e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
+       * Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
+       ellipsize filters strings if it is long.
+
        * Hand-apply 24ae3a8f0a68529b50c34079e643caf6b9327523 from master;
        use the number of mapped audio channels for the DCP name, not the
        number of DCP channels (#479).