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

diff --git a/libraries/Ethernet/EthernetClient.h b/libraries/Ethernet/EthernetClient.h
deleted file mode 100644
index 44740fe..0000000
--- a/libraries/Ethernet/EthernetClient.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef ethernetclient_h
-#define ethernetclient_h
-#include "Arduino.h"	
-#include "Print.h"
-#include "Client.h"
-#include "IPAddress.h"
-
-class EthernetClient : public Client {
-
-public:
-  EthernetClient();
-  EthernetClient(uint8_t sock);
-
-  uint8_t status();
-  virtual int connect(IPAddress ip, uint16_t port);
-  virtual int connect(const char *host, uint16_t port);
-  virtual size_t write(uint8_t);
-  virtual size_t write(const uint8_t *buf, size_t size);
-  virtual int available();
-  virtual int read();
-  virtual int read(uint8_t *buf, size_t size);
-  virtual int peek();
-  virtual void flush();
-  virtual void stop();
-  virtual uint8_t connected();
-  virtual operator bool();
-
-  friend class EthernetServer;
-  
-  using Print::write;
-
-private:
-  static uint16_t _srcport;
-  uint8_t _sock;
-};
-
-#endif