fix cherry-pick conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 11 Dec 2015 16:05:57 +0000 (11:05 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 16 Dec 2015 10:54:43 +0000 (05:54 -0500)
commit8ba8f1c0b08bb1c8ffbb4f419806e0c05619808b
treebdcf66336561a365b8a37be41eac62ce06481f40
parente302ce8662fb38a791d5c19da14fbce560bcbff2
fix cherry-pick conflict
libs/surfaces/mackie/mackie_control_protocol.cc
libs/surfaces/mackie/mackie_control_protocol.h
libs/surfaces/mackie/mcp_buttons.cc
libs/surfaces/mackie/strip.cc
libs/surfaces/mackie/strip.h
libs/surfaces/mackie/surface.cc
libs/surfaces/mackie/surface.h