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)
1  2 
libs/ardour/audio_diskstream.cc
libs/ardour/audio_track.cc
libs/ardour/lv2_plugin.cc
libs/surfaces/mackie/mackie_control_protocol.cc

Simple merge
Simple merge
Simple merge