fix merge conflicts from master
[ardour.git] / mcp / bcf2000.device
2012-05-24 Paul Davisadd BCF2000 device info file for MCP