Merge branch 'master' into Arduino_1.5.5

ntruchsess · Jul 25, 2014 · faf89bc · faf89bc
2 parents 9601aaf + 8f5bed1
commit faf89bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/UIPEthernet/src/UIPServer.h b/UIPEthernet/src/UIPServer.h
@@ -23,7 +23,7 @@
 #import "Server.h"
 #import "UIPClient.h"
 
-class UIPServer : Server {
+class UIPServer : public Server {
 
 public:
   UIPServer(uint16_t);