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

diff --git a/libraries/Ethernet/Dns.h b/libraries/Ethernet/Dns.h
deleted file mode 100644
index 6bcb98a..0000000
--- a/libraries/Ethernet/Dns.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Arduino DNS client for WizNet5100-based Ethernet shield

-// (c) Copyright 2009-2010 MCQN Ltd.

-// Released under Apache License, version 2.0

-

-#ifndef DNSClient_h

-#define DNSClient_h

-

-#include <EthernetUdp.h>

-

-class DNSClient

-{

-public:

-    // ctor

-    void begin(const IPAddress& aDNSServer);

-

-    /** Convert a numeric IP address string into a four-byte IP address.

-        @param aIPAddrString IP address to convert

-        @param aResult IPAddress structure to store the returned IP address

-        @result 1 if aIPAddrString was successfully converted to an IP address,

-                else error code

-    */

-    int inet_aton(const char *aIPAddrString, IPAddress& aResult);

-

-    /** Resolve the given hostname to an IP address.

-        @param aHostname Name to be resolved

-        @param aResult IPAddress structure to store the returned IP address

-        @result 1 if aIPAddrString was successfully converted to an IP address,

-                else error code

-    */

-    int getHostByName(const char* aHostname, IPAddress& aResult);

-

-protected:

-    uint16_t BuildRequest(const char* aName);

-    uint16_t ProcessResponse(uint16_t aTimeout, IPAddress& aAddress);

-

-    IPAddress iDNSServer;

-    uint16_t iRequestId;

-    EthernetUDP iUdp;

-};

-

-#endif