Skip to content
GitLab
Commit 94f557ef authored by Oleksiy Slyshyk's avatar Oleksiy Slyshyk
Browse files

Merge branch 'develop' of https://github.com/texane/stlink into develop 

# Conflicts:
#	include/stlink/chipid.h
#	src/chipid.c
parents 03ef7bd5 7c0ebda0
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment