Merge branch 'master' into ide-1.5.x

Author: cmaglie

build/shared/revisions.txt

@@ -55,6 +55,9 @@ The following changes are included also in the (not yet released) Arduino IDE 1.
 * Esplora: added reading form Tinkerkit inputs
 * SoftwareSerial: Fix idle level when initializing with inverted logic (Jens-Christian Skibakk)
 
+[firmware]
+* Wifishield: fixed paths on firmware upgrade scripts
+
 ARDUINO 1.5.6-r2 BETA 2014.02.21
 
 [ide]
@@ -317,6 +320,9 @@ ARDUINO 1.0.6 - not yet released
 * Esplora: added reading form Tinkerkit inputs
 * SoftwareSerial: Fix idle level when initializing with inverted logic (Jens-Christian Skibakk)
 
+[firmware]
+* Wifishield: fixed paths on firmware upgrade scripts
+
 ARDUINO 1.0.5-r2 - 2014.01.08
 
 * Signed drivers for Windows 8.1

hardware/arduino/avr/firmwares/wifishield/scripts/ArduinoWifiShield_upgrade_mac.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-WIFI_FW_PATH="/hardware/arduino/firmwares/wifi-shield"
+WIFI_FW_PATH="/hardware/arduino/firmwares/wifishield/binary"
 AVR_TOOLS_PATH="/hardware/tools/avr/bin"
 
 progname=$0