Show
Ignore:
Timestamp:
12/07/08 05:50:41 (3 years ago)
Author:
ppalmers
Message:

Merge all changes from 2.0 branch into trunk (since r1361). This _should_ contain all forward merges done in the mean time. At this moment in time both branches should be in sync.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/configuration

    r1435 r1498  
    158158    driver      = 1; # BeBoB 
    159159}, 
     160 { 
     161   vendorid = 0x0000000A; 
     162   modelid = 0x00030000; 
     163   vendorname = "CME"; 
     164   modelname = "Matrix K FW"; 
     165   driver = 1; # BeBoB 
     166 },  
    160167 { 
    161168    vendorid = 0x1486;