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)
commit5cf1f7f3b28abd36f9390014016def94f4e1468d
tree6943b1a55e46b9ab11ac1cf9c146aa09708305e4
parent4861eca97483128e5febb575b94688581abb0154
parentdce6b71e825397ff086562b6177453369e48cec9
Merge branch 'master' into windows
libs/ardour/audioengine.cc