diff options
| author | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2020-08-16 14:08:24 +0200 |
| commit | 630936472237f319b46d51f691bf6c36d80610b3 (patch) | |
| tree | ae7e1eef805073b2fc0e3bd9bf3801b8f557e356 /examples/device/hid_multiple_interface/src | |
| parent | 444e4d282137953e6834360a9fb866331d21d954 (diff) | |
| parent | e90cf7a676eddcbd9c35d2d99a0a9cd14686e2ce (diff) | |
Merge remote-tracking branch 'upstream/master' into uac2
Conflicts:
src/device/usbd.c
src/device/usbd.h
src/portable/st/synopsys/dcd_synopsys.c
Diffstat (limited to 'examples/device/hid_multiple_interface/src')
0 files changed, 0 insertions, 0 deletions