fix merge conflict with master
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 23 Jan 2014 18:41:20 +0000 (13:41 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 23 Jan 2014 18:41:20 +0000 (13:41 -0500)
commit7000afdc66c9e0ae8dcf9ec080517dabba1e7f34
tree19574ed8a1fbafa6bed222d8cf817ee1c8098314
parent065e1e63342633f72725a5309926f71c87804293
parent40d8c5ae01f25e02457c554170a53d537246a7d4
fix merge conflict with master
17 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/sfdb_ui.cc
libs/ardour/ardour/audio_diskstream.h
libs/ardour/ardour/auditioner.h
libs/ardour/ardour/internal_send.h
libs/ardour/ardour/midi_diskstream.h
libs/ardour/ardour/rc_configuration_vars.h
libs/ardour/ardour/send.h
libs/ardour/ardour/session.h
libs/ardour/audio_track.cc
libs/ardour/lv2_plugin.cc
libs/ardour/midi_track.cc
libs/ardour/route.cc
libs/ardour/session.cc
libs/ardour/smf_source.cc
libs/panners/vbap/vbap.cc