fix some merge issues from cherry-picking mackie changes from a mixbus repo
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 16 Dec 2015 11:31:06 +0000 (06:31 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 16 Dec 2015 11:31:06 +0000 (06:31 -0500)
commit3b872fb207f54945ce552d3b4a887951d8beef27
treec465d58819149dfd34120aff5bc12c52472cea93
parent11f069f11869284b8f32bd3564abbb7cd63a4ff1
fix some merge issues from cherry-picking mackie changes from a mixbus repo
libs/surfaces/mackie/mackie_control_protocol.cc
libs/surfaces/mackie/strip.cc