Skip to content

Commit

Permalink
Merge branch 'release/v1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Oct 14, 2016
2 parents 869be67 + e9cef0c commit 235320c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
assert isdir(FRAMEWORK_DIR)

BUILTIN_USB_FLAGS = (
"USB_AUDIO",
"USB_HID",
"USB_SERIAL_HID",
"USB_DISK",
Expand Down
2 changes: 1 addition & 1 deletion platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-teensy.git"
},
"version": "1.2.0",
"version": "1.2.1",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand Down

0 comments on commit 235320c

Please sign in to comment.