Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 85 deletions

diff --git a/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino b/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
deleted file mode 100644
index 5cc3f8a..0000000
--- a/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-  Basic Web Server
- 
- A simple web server that replies with nothing, but prints the client's request
- and the server IP address.
-
- Circuit:
- * GSM shield attached
- 
- created 
- by David Cuartielles
- modified 21 Nov 2012
- by Tom Igoe
- 
- http://arduino.cc/en/Tutorial/GSMToolsTestWebServer
- 
- This example code is part of the public domain
- */
- #include <GSM.h>
-
-// PIN Number
-#define PINNUMBER ""
-
-// APN data
-#define GPRS_APN       "GPRS_APN" // replace your GPRS APN
-#define GPRS_LOGIN     "login"    // replace with your GPRS login
-#define GPRS_PASSWORD  "password" // replace with your GPRS password
-
-
-// initialize the library instance
-GPRS gprs;
-GSM gsmAccess;     // include a 'true' parameter for debug enabled
-GSMServer server(80); // port 80 (http default)
-
-// timeout
-const unsigned long __TIMEOUT__ = 10*1000;
-
-void setup()
-{
-  // initialize serial communications and wait for port to open:
-  Serial.begin(9600);
-  while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
-  }
-
-  Serial.println("starting,..");
-  // connection state
-  boolean connected = true;
-
-  // Start GSM shield
-  // If your SIM has PIN, pass it as a parameter of begin() in quotes
-  while(!connected)
-  {
-    if((gsmAccess.begin(PINNUMBER)==GSM_READY) &
-        (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD)==GPRS_READY))
-      connected = true;
-    else
-    {
-      Serial.println("Not connected");
-      delay(1000);
-    }
-  }
-
-  Serial.println("Connected to GPRS network");
-
-  // start server
-  server.begin();
-
-  //Get IP.
-  IPAddress LocalIP = gprs.getIPAddress();
-  Serial.println("Server IP address=");
-  Serial.println(LocalIP);
-}
-
-void loop(){
-  GSMClient client = server.available();
-  
- if (client) {
-   if (client.available()) {
-    Serial.write(client.read()); 
-   }
-}
-
-}
-