Skip to content

Commit

Permalink
Merge branch 'release/v2.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Sep 20, 2017
2 parents 3e43ae3 + 4af01c5 commit b6523e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions examples/arduino-internal-libs/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
; Please visit documentation for the other options and examples
; http://docs.platformio.org/page/projectconf.html

[env:adafruit_gemma_m0]
platform = atmelsam
framework = arduino
board = adafruit_gemma_m0
; [env:adafruit_gemma_m0]
; platform = atmelsam
; framework = arduino
; board = adafruit_gemma_m0

[env:adafruit_feather_m0]
platform = atmelsam
Expand Down
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-atmelsam.git"
},
"version": "2.6.0",
"version": "2.7.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json",
Expand Down Expand Up @@ -45,7 +45,7 @@
"framework-mbed": {
"type": "framework",
"optional": true,
"version": "~4.150.0"
"version": "~4.151.0"
},
"framework-simba": {
"type": "framework",
Expand Down

0 comments on commit b6523e6

Please sign in to comment.