Merge branch 'master' into audioengine
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 21:41:49 +0000 (17:41 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 21:41:49 +0000 (17:41 -0400)
commitd074bc586e494d7dd83d415a487195a477095a4f
tree8748ae1d85ef796449dcd30cff6ba6f2196a4704
parent6bcdf4f0f106d0b83ed7f221f546c132585e19e7
parent91b027a4a0c0e90398b9c6dbb5611b2acc4f2f8e
Merge branch 'master' into audioengine
libs/ardour/audio_diskstream.cc
libs/ardour/audio_track.cc
libs/ardour/lv2_plugin.cc
libs/surfaces/mackie/mackie_control_protocol.cc