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

diff --git a/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino b/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino
deleted file mode 100644
index d34168c..0000000
--- a/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- LCD Print
- 
- Print the reading from a sensor to the screen.
- 
- 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 robot's screen
-  Robot.beginLCD();
-}
-
-void loop() {
-  // read a analog port
-  value=Robot.analogRead(TK4);
-
-  // write the sensor value on the screen
-  Robot.fill(0, 255, 0);
-  Robot.textSize(1);
-  Robot.text(value, 0, 0);  
-
-  delay(500);
-
-  // erase the previous text on the screen
-  Robot.fill(255, 255, 255);
-  Robot.textSize(1);
-  Robot.text(value, 0, 0);  
-}