Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Mar 2015 23:30:08 +0000 (23:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Mar 2015 23:30:08 +0000 (23:30 +0000)
commit86aaba4f392c35ccf28221049f87b8cdba868777
tree9809348c4b13f1f8a0d1f3701f829cda50b98db5
parent11d68f1cda11ecf5983451c10a73a37692b025bb
Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
allow "deletion" of the audio part of a FFmpeg file from the
timeline; delete unmaps the audio (#316).
ChangeLog
TO_PORT
src/lib/audio_mapping.cc
src/lib/audio_mapping.h
src/wx/content_menu.cc
src/wx/content_menu.h
src/wx/content_panel.cc
src/wx/timeline.cc
src/wx/timeline.h