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/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino b/libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino
deleted file mode 100644
index e34a7d2..0000000
--- a/libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- LCD Write Text
- 
- Use the Robot's library function text() to
- print out text to the robot's screen. Take
- into account that you need to erase the
- information before continuing writing.
- 
- 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>
-
-void setup() {
-  // initialize the robot
-  Robot.begin();
-
-  // initialize the screen
-  Robot.beginTFT();
-}
-void loop() {
-  Robot.stroke(0, 0, 0);              // choose the color black
-  Robot.text("Hello World", 0, 0);  // print the text
-  delay(2000);
-  Robot.stroke(255, 255, 255);        // choose the color white
-  Robot.text("Hello World", 0, 0);  // writing text in the same color as the BG erases the text!
-  
-  Robot.stroke(0, 0, 0);              // choose the color black
-  Robot.text("I am a robot", 0, 0); // print the text
-  delay(3000);
-  Robot.stroke(255, 255, 255);         // choose the color black
-  Robot.text("I am a robot", 0, 0);  // print the text
-}