Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

micropython
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

d71cd86d

Commit d71cd86d authored 11 years ago by Damien George

Downloads
- Plain Diff

Merge branch 'iabdalkader-master'

Conflicts:
	stm/usb.c
	stm/usb.h

parents 01156d51 565fdccf

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

stm/stmusbd/usbd_cdc_vcp.c 4 additions, 1 deletion

stm/stmusbd/usbd_cdc_vcp.c
stm/stmusbd/usbd_pyb_core.c 1 addition, 1 deletion

stm/stmusbd/usbd_pyb_core.c
stm/usb.c 5 additions, 0 deletions

stm/usb.c
stm/usb.h 1 addition, 0 deletions

stm/usb.h

with 11 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment