X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=5d0338bc2d4070abc45bf7397fbbc767d92f822e;hb=2e27d014c584ac5348feca9c2d21b036fba437c0;hp=a528dd82798038073ce7c48337d6cb3d1a581cac;hpb=1f9c2f2699718da6f3f16ab7aa00b41789ec180a;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index a528dd827..5d0338bc2 100644
--- 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).