mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-07 15:25:01 +01:00
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 |
||
|---|---|---|
| .. | ||
| macosx | ||
| midi++ | ||
| test | ||
| channel.cc | ||
| COPYING | ||
| ipmidi_port.cc | ||
| libmidi++.pc.in | ||
| libmidi++.spec.in | ||
| midi.cc | ||
| miditrace.cc | ||
| midnam_patch.cc | ||
| mmc.cc | ||
| mmctest.cc | ||
| mtc.cc | ||
| parser.cc | ||
| port.cc | ||
| run-tests.sh | ||
| wscript | ||