fix merge errors with master
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 10 Jan 2014 19:53:03 +0000 (14:53 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 10 Jan 2014 19:53:03 +0000 (14:53 -0500)
commitd15fda6d751a465d278f477923075d4783f3b1ca
tree99e36ff934f50d9c980dbeab09ad021cda3d098c
parent22c303d8f6c355a7229eb459cedf4fbdf0eb3c1d
parent0bdf4c25cfee8cf2408d2b1367f2c5e5c8c509b1
fix merge errors with master
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/mono_panner.cc
gtk2_ardour/stereo_panner.cc
libs/ardour/ardour/panner.h
libs/ardour/ardour/panner_manager.h
libs/ardour/ardour/panner_shell.h
libs/ardour/ardour/route.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/gtkmm2ext/utils.cc
wscript