Merged 1.0.5

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt

1 files changed, 4 insertions, 1 deletions

diff --git a/firmwares/wifishield/wifiHD/src/cmd_wl.h b/firmwares/wifishield/wifiHD/src/cmd_wl.h
index 3953b95..a1d1a0f 100644
--- a/firmwares/wifishield/wifiHD/src/cmd_wl.h
+++ b/firmwares/wifishield/wifiHD/src/cmd_wl.h
@@ -54,7 +54,10 @@ cmd_state_t cmd_statSpi(int argc, char* argv[], void* ctx);
 cmd_state_t cmd_resetStatSpi(int argc, char* argv[], void* ctx);
 cmd_state_t cmd_gethostbyname(int argc, char* argv[], void* ctx);
 cmd_state_t cmd_setDnsServer(int argc, char* argv[], void* ctx);
-cmd_state_t cmd_startTcpSrv(int argc, char* argv[], void* ctx);
+cmd_state_t cmd_startSrv(int argc, char* argv[], void* ctx);
+cmd_state_t cmd_startCli(int argc, char* argv[], void* ctx);
+cmd_state_t cmd_dumpBuf(int argc, char* argv[], void* ctx);
+cmd_state_t cmd_sendUdpData(int argc, char* argv[], void* ctx);
 #ifdef WFE_6_12
 cmd_state_t cmd_ibss(int argc, char* argv[], void* ctx);
 #endif