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/GSM/GSM3ShieldV1BaseProvider.cpp b/libraries/GSM/GSM3ShieldV1BaseProvider.cpp
deleted file mode 100644
index d63967b..0000000
--- a/libraries/GSM/GSM3ShieldV1BaseProvider.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <GSM3ShieldV1BaseProvider.h>
-#include <GSM3ShieldV1ModemCore.h>
-#include <Arduino.h>
-
-// Returns 0 if last command is still executing
-// 1 if success
-// >1 if error 
-int GSM3ShieldV1BaseProvider::ready() 
-{
-	theGSM3ShieldV1ModemCore.manageReceivedData();
-
-	return theGSM3ShieldV1ModemCore.getCommandError();
-};
-
-void GSM3ShieldV1BaseProvider::prepareAuxLocate(PROGMEM prog_char str[], char auxLocate[])
-{
-	int i=0;
-	char c;
-
-	do
-	{	
-		c=pgm_read_byte_near(str + i); 
-		auxLocate[i]=c;
-		i++;
-	} while (c!=0);
-}
-