Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 13 Sep 2013 16:35:10 +0000 (12:35 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 13 Sep 2013 16:35:10 +0000 (12:35 -0400)
1  2 
libs/ardour/audioengine.cc

Simple merge