summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-12 17:23:50 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-12 17:23:50 +0100
commit2e27d014c584ac5348feca9c2d21b036fba437c0 (patch)
treec546f27955e667ba4c86895246cf15ee470a2510 /ChangeLog
parent1f9c2f2699718da6f3f16ab7aa00b41789ec180a (diff)
Hand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from master.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
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).