merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 15 Jan 2014 19:29:32 +0000 (14:29 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 15 Jan 2014 19:29:32 +0000 (14:29 -0500)
commit9aacefc17010a889222425f97b99050171165038
treea1a80ed3557caa2b223274fd33f54df35252ee5f
parent96586e81f40e883a7807c88eaa7df73b60140352
parent79b56b1d3319d03d14b2d3e2f8d6cd7b3e797deb
merge with master
gtk2_ardour/audio_time_axis.cc
gtk2_ardour/automation_line.cc
gtk2_ardour/midi_time_axis.cc
gtk2_ardour/midi_time_axis.h
libs/ardour/vst_plugin.cc
libs/panners/1in2out/panner_1in2out.cc
libs/panners/2in2out/panner_2in2out.cc
libs/panners/stereobalance/panner_balance.cc
libs/panners/vbap/vbap.cc