merge (w/fix) with master
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 4 Feb 2014 19:21:35 +0000 (14:21 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 4 Feb 2014 19:21:35 +0000 (14:21 -0500)
commit2b9421fd391efcddde0be3397cb66e19b744a155
tree9379555f58acff44337676416d229a0f4c0562e8
parentc11bf0cc72669feea1a6c2071cef5255bbb1905a
parent4818621a2797871a10c47fc2f813e51668479fcc
merge (w/fix) with master
gtk2_ardour/plugin_ui.cc
libs/ardour/ardour/audio_buffer.h
libs/ardour/ardour/buffer.h
libs/ardour/ardour/midi_buffer.h
libs/ardour/export_channel.cc
libs/ardour/lv2_evbuf.c
libs/ardour/route.cc
libs/panners/vbap/vbap.cc