Merged with trunk revision 610
authorDavid Robillard <d@drobilla.net>
Thu, 15 Jun 2006 22:31:13 +0000 (22:31 +0000)
committerDavid Robillard <d@drobilla.net>
Thu, 15 Jun 2006 22:31:13 +0000 (22:31 +0000)
commite13e84677a9213fb54d641483a7fcf5ecf2feb0d
treee4462e8a8e14f15575ff5cbfbfa7cf42b14c00fc
parentb5db1f624d347c8865c27fdae23bf4595be372d2
Merged with trunk revision 610

git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
33 files changed:
LAST_MERGE
gtk2_ardour/ardour_ui_ed.cc
gtk2_ardour/editor.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/new_session_dialog.cc
libs/ardour/ardour/constsource.h [deleted file]
libs/ardour/ardour/filesource.h [deleted file]
libs/ardour/ardour/osc.h
libs/ardour/ardour/seqsource.h [deleted file]
libs/ardour/ardour/session.h
libs/ardour/ardour/silentsource.h [deleted file]
libs/ardour/ardour/types.h
libs/ardour/control_protocol_manager.cc
libs/ardour/filesource.cc [deleted file]
libs/ardour/io.cc
libs/ardour/session_control.cc
libs/ardour/session_feedback.cc
libs/gtkmm2ext/fastmeter.cc
libs/surfaces/control_protocol/SConscript
libs/surfaces/control_protocol/basic_ui.cc
libs/surfaces/control_protocol/basic_ui.h [deleted file]
libs/surfaces/control_protocol/control_protocol.cc
libs/surfaces/control_protocol/control_protocol.h [deleted file]
libs/surfaces/control_protocol/control_protocol/basic_ui.h [new file with mode: 0644]
libs/surfaces/control_protocol/control_protocol/control_protocol.h [new file with mode: 0644]
libs/surfaces/control_protocol/control_protocol/smpte.h [new file with mode: 0644]
libs/surfaces/control_protocol/smpte.cc [new file with mode: 0644]
libs/surfaces/generic_midi/generic_midi_control_protocol.h
libs/surfaces/generic_midi/interface.cc
libs/surfaces/tranzport/interface.cc
libs/surfaces/tranzport/tranzport_control_protocol.cc
libs/surfaces/tranzport/tranzport_control_protocol.h
templates/SConscript