Revert "Remove join function; the code is long and I don't think anybody"
authorCarl Hetherington <cth@carlh.net>
Sat, 21 Jul 2018 20:47:25 +0000 (21:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 21 Jul 2018 20:47:25 +0000 (21:47 +0100)
commit6199e090dc1e32d3753ba7e7d7ea8c5f0d79f046
treeb09d9b6b19dadb694590981775a61f829b6f3622
parentcbd4450197a083bf58bda510e626f73ba583cb66
Revert "Remove join function; the code is long and I don't think anybody"

It turns out Carsten uses it :)

This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.
14 files changed:
ChangeLog
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/caption_content.cc
src/lib/caption_content.h
src/lib/content.cc
src/lib/content.h
src/lib/exceptions.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/video_content.cc
src/lib/video_content.h
src/wx/content_menu.cc
src/wx/content_menu.h