Commit 81a5352

committed

Merge branch 'master' into ide-1.5.x

2 parents 70ec1ab + 494d3de commit 81a5352Copy full SHA for 81a5352

File tree

-1

lines changed

build/shared
- revisions.txt
hardware/arduino/avr/firmwares/wifishield/scripts
- ArduinoWifiShield_upgrade_mac.sh

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ The following changes are included also in the (not yet released) Arduino IDE 1.`
`55`	`55`	`* Esplora: added reading form Tinkerkit inputs`
`56`	`56`	`* SoftwareSerial: Fix idle level when initializing with inverted logic (Jens-Christian Skibakk)`
`57`	`57`
	`58`	`+[firmware]`
	`59`	`+* Wifishield: fixed paths on firmware upgrade scripts`
	`60`	`+`
`58`	`61`	`ARDUINO 1.5.6-r2 BETA 2014年02月21日`
`59`	`62`
`60`	`63`	`[ide]`
`@@ -317,6 +320,9 @@ ARDUINO 1.0.6 - not yet released`
`317`	`320`	`* Esplora: added reading form Tinkerkit inputs`
`318`	`321`	`* SoftwareSerial: Fix idle level when initializing with inverted logic (Jens-Christian Skibakk)`
`319`	`322`
	`323`	`+[firmware]`
	`324`	`+* Wifishield: fixed paths on firmware upgrade scripts`
	`325`	`+`
`320`	`326`	`ARDUINO 1.0.5-r2 - 2014年01月08日`
`321`	`327`
`322`	`328`	`* Signed drivers for Windows 8.1`

100644100755

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-WIFI_FW_PATH="/hardware/arduino/firmwares/wifi-shield"`
	`3`	`+WIFI_FW_PATH="/hardware/arduino/firmwares/wifishield/binary"`
`4`	`4`	`AVR_TOOLS_PATH="/hardware/tools/avr/bin"`
`5`	`5`
`6`	`6`	`progname=0ドル`

Comments

(0)