summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-21 21:47:25 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-21 21:47:25 +0100
commit6199e090dc1e32d3753ba7e7d7ea8c5f0d79f046 (patch)
treeb09d9b6b19dadb694590981775a61f829b6f3622 /ChangeLog
parentcbd4450197a083bf58bda510e626f73ba583cb66 (diff)
Revert "Remove join function; the code is long and I don't think anybody"
It turns out Carsten uses it :) This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec5c163d4..58269eed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,5 @@
2018-07-20 Carl Hetherington <cth@carlh.net>
- * Remove Join function.
-
* Advanced configuration option to allow any container ratio.
* Support closed-caption creation (#725).