Fixed incomplete merge for audioengine.cc
authorGZharun <grygoriiz@wavesglobal.com>
Tue, 23 Jun 2015 10:15:32 +0000 (13:15 +0300)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 29 Jun 2015 18:18:15 +0000 (14:18 -0400)
commit6584a89c4eb5024fe89a15acd8e4fa4697e606be
tree14dd37b41ca77540e2da497bb34808c406ea987e
parenta38e67d55bec8a632dc136558f926daa40ce093d
Fixed incomplete merge for audioengine.cc
[To be reviewed by] Paul Davis
libs/ardour/audioengine.cc