fix conflicts after merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 5 Aug 2013 18:22:32 +0000 (14:22 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 5 Aug 2013 18:22:32 +0000 (14:22 -0400)
commit616f2a0370a10dcc7372a95f6bca9f5a45698980
treeb07badccad237cc66d0668482ad65cedefdee23f
parent499b7fcfa9f3e8535a4500143a9d7af7b67c6984
parent38e4f7bd1ba2ec9ae37dbb384da449f894cd8564
fix conflicts after merge with master
22 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/engine_dialog.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/port_group.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/route_params_ui.cc
gtk2_ardour/route_ui.cc
gtk2_ardour/utils.cc
libs/ardour/ardour/audio_diskstream.h
libs/ardour/ardour/session.h
libs/ardour/ardour/types.h
libs/ardour/audio_diskstream.cc
libs/ardour/capturing_processor.cc
libs/ardour/internal_send.cc
libs/ardour/lv2_plugin.cc
libs/ardour/midi_diskstream.cc
libs/ardour/port_insert.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/session_ltc.cc
libs/ardour/session_transport.cc