merge with master and fix 4 conflicts by hand
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jun 2014 15:32:13 +0000 (11:32 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Jun 2014 15:32:13 +0000 (11:32 -0400)
commit8c9749e42faf7808034ed8b7afce4a2fe6dc6f33
tree823af8a96f4e0b2a404f5e52eadf4f46e1d10229
parentf6d29abfc75c460b9e35717f2907e4e61bf38058
parent08a1409b1f5b5558d2eccc28a3ae4cbd44391812
merge with master and fix 4 conflicts by hand
14 files changed:
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/transcode_ffmpeg.cc
gtk2_ardour/video_server_dialog.cc
gtk2_ardour/video_timeline.cc
libs/ardour/ardour/file_source.h
libs/ardour/ardour/smf_source.h
libs/ardour/plugin_insert.cc
libs/ardour/smf_source.cc
libs/evoral/evoral/SMF.hpp
libs/evoral/src/SMF.cpp
libs/pbd/clear_dir.cc
libs/pbd/pbd/clear_dir.h
libs/surfaces/generic_midi/midicontrollable.cc