diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-04-03 13:51:04 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-04-03 13:51:04 +0200 |
| commit | ee90e68e86dd61d86f5d17b69080338328765b22 (patch) | |
| tree | e620c0edc2690ab789b665e567910640597aa6fe /libraries/WiFi/examples/WifiWebServer | |
| parent | 0ecdc5ebc96ad4c7c548c438a03d9ce00679db8b (diff) | |
| parent | f50c307be280dc6ece9e70c43b301c1db36291a0 (diff) | |
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
Diffstat (limited to 'libraries/WiFi/examples/WifiWebServer')
| -rw-r--r-- | libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino b/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino index a514e15..7d7a247 100644 --- a/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino +++ b/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino @@ -1,5 +1,5 @@ /* - Web Server + WiFi Web Server A simple web server that shows the value of the analog input pins. using a WiFi shield. @@ -15,7 +15,9 @@ by dlf (Metodo2 srl) modified 31 May 2012 by Tom Igoe + */ + #include <SPI.h> #include <WiFi.h> |