merge (with conflict fixes) with master (even against rgareus' recommendation)
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 14 Jan 2014 15:56:17 +0000 (10:56 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 14 Jan 2014 15:56:17 +0000 (10:56 -0500)
commitcf806123ca5faaef483f898daba3f7bd38ec62eb
treef11f2f9ff64ea3b3682c81b8dd893ba0e9476445
parentcfc9a1f22ea38d4dd6c619d6cec25fe29b1c2f48
parentd9296b71237d9d3058b0796eda25258fadd45ad9
merge (with conflict fixes) with master (even against rgareus' recommendation)
gtk2_ardour/mixer_strip.cc
gtk2_ardour/panner_ui.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/send_ui.cc
libs/ardour/ardour/panner_manager.h
libs/ardour/ardour/panner_shell.h
libs/ardour/ardour/rc_configuration_vars.h
libs/ardour/panner_manager.cc
libs/ardour/route.cc
libs/panners/vbap/vbap.cc