John Emmas
b855e5f322
Conflicts (hopefully resolved): gtk2_ardour/wscript libs/ardour/ardour/audioregion.h libs/ardour/ardour/debug.h libs/ardour/ardour/directory_names.h libs/ardour/ardour/filesystem_paths.h libs/ardour/ardour/session_event.h libs/gtkmm2ext/gtkmm2ext/utils.h libs/panners/1in2out/wscript libs/panners/2in2out/wscript libs/panners/vbap/wscript libs/pbd/pbd/debug.h libs/pbd/pbd/file_utils.h libs/pbd/pbd/pathexpand.h libs/pbd/pbd/ringbuffer.h libs/pbd/pbd/ringbufferNPT.h libs/pbd/pbd/search_path.h libs/pbd/pbd/stacktrace.h libs/pbd/pbd/uuid.h libs/pbd/pbd/uuid_boost.h libs/surfaces/control_protocol/control_protocol/basic_ui.h libs/surfaces/control_protocol/control_protocol/control_protocol.h |
||
|---|---|---|
| .. | ||
| generic_midi_control_protocol.cc | ||
| generic_midi_control_protocol.h | ||
| gmcp_gui.cc | ||
| i18n.h | ||
| interface.cc | ||
| midiaction.cc | ||
| midiaction.h | ||
| midicontrollable.cc | ||
| midicontrollable.h | ||
| midifunction.cc | ||
| midifunction.h | ||
| midiinvokable.cc | ||
| midiinvokable.h | ||
| wscript | ||