diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /mcp/qcon.device | |
parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) |
fix merge conflicts from master
Diffstat (limited to 'mcp/qcon.device')
-rw-r--r-- | mcp/qcon.device | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mcp/qcon.device b/mcp/qcon.device new file mode 100644 index 0000000000..48c5390835 --- /dev/null +++ b/mcp/qcon.device @@ -0,0 +1,14 @@ +<MackieProtocolDevice> + <Name value="Qcon"/> + <Strips value="8"/> + <Extenders value="0"/> + <MasterFader value="yes"/> + <TimecodeDisplay value="yes"/> + <TwoCharacterDisplay value="no"/> + <GlobalControls value="yes"/> + <JogWheel value="yes"/> + <TouchSenseFaders value="yes"/> + <LogicControlButtons value="yes"/> + <usesIPMIDI value="no"/> + <NoHandShake value="yes"/> +</MackieProtocolDevice> |