Merge branch 'ide-1.5.x' into zero

Conflicts: hardware/arduino/sam/platform.txt

Merge branch 'ide-1.5.x' into zero
ede8fc58 · Cristian Maglie · Cristian Maglie · 43819330 · ede8fc58
Commit ede8fc58 authored 10 years ago by Cristian Maglie Committed by Cristian Maglie 10 years ago
--- a/platform.txt
+++ b/platform.txt
@@ -4,7 +4,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

 name=Arduino ARM Cortex-M0+ (32-bits) Boards
-version=1.8.0
+version=1.6.0

 # Compile variables
 # ----------------------