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, 27 deletions

diff --git a/libraries/WiFi/WiFiServer.h b/libraries/WiFi/WiFiServer.h
deleted file mode 100644
index 68b574c..0000000
--- a/libraries/WiFi/WiFiServer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef wifiserver_h
-#define wifiserver_h
-
-extern "C" {
-  #include "utility/wl_definitions.h"
-}
-
-#include "Server.h"
-
-class WiFiClient;
-
-class WiFiServer : public Server {
-private:
-  uint16_t _port;
-  void*     pcb;
-public:
-  WiFiServer(uint16_t);
-  WiFiClient available(uint8_t* status = NULL);
-  void begin();
-  virtual size_t write(uint8_t);
-  virtual size_t write(const uint8_t *buf, size_t size);
-  uint8_t status();
-
-  using Print::write;
-};
-
-#endif