Skip to content
Snippets Groups Projects
Commit 052af21d authored by Cristian Maglie's avatar Cristian Maglie Committed by Cristian Maglie
Browse files

Merge branch 'master' into zero 

Conflicts:
	hardware/arduino/sam/platform.txt
parent 319688b0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
platform.txt
+ 2
− 2
View file @ 052af21d
......@@ -3,8 +3,8 @@
# For more info:
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
name=Arduino ARM Cortex-M0+ (32-bits) Boards
version=1.6.0
name=Arduino SAMD (32-bits ARM Cortex-M0+) Boards
version=1.6.1
# Compile variables
# ----------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment