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/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino b/libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino
deleted file mode 100644
index 0078b77..0000000
--- a/libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- LCD Debug Print
- 
- Use the Robot's library function debugPrint() to
- quickly send a sensor reading to the robot's creen.
- 
- Circuit:
- * Arduino Robot
- 
- created 1 May 2013
- by X. Yang
- modified 12 May 2013
- by D. Cuartielles
- 
- This example is in the public domain
- */
-
-#include <ArduinoRobot.h>
-
-int value;
-
-void setup() {
-  // initialize the robot
-  Robot.begin();
-
-  // initialize the screen
-  Robot.beginTFT();
-}
-void loop(){
-  // read a value
-  value = analogRead(A4);
-
-  // send the value to the screen
-  Robot.debugPrint(value);
-
-  delay(40);
-}