Merge branch 'master' into next

Browse Source

...

This commit is contained in:

Arne Fitzenreiter

2011-07-03 11:03:57 +02:00

parent 0f5490855a edc2f9c4fd

commit 74459c0ade

5 changed files with 1195 additions and 328 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1035

src/hwdata/pci.ids

File diff suppressed because it is too large Load Diff

478

src/hwdata/usb.ids

File diff suppressed because it is too large Load Diff