manually fix rebase/merge issues for Mackie Control support
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 May 2016 12:20:11 +0000 (08:20 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 31 May 2016 19:30:42 +0000 (15:30 -0400)
commit4b0a235f91c43a0011b2bc466a910c5b015560e0
tree4bf7ca6a48cc871f7b8a82e2c01eb6fca74a388d
parent01890af71e19004f5e830161f6d41d810d5f2687
manually fix rebase/merge issues for Mackie Control support
libs/surfaces/mackie/mackie_control_protocol.cc