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/Compass/Compass.ino b/libraries/Robot_Control/examples/learn/Compass/Compass.ino
deleted file mode 100644
index 4170ab7..0000000
--- a/libraries/Robot_Control/examples/learn/Compass/Compass.ino
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Compass
- 
- Try the compass both on the robot's TFT
- and through the serial port.
- 
- 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 robot's screen
-  Robot.beginTFT();
-
-  // initialize the serial port
-  Serial.begin(9600);
-}
-
-void loop() {
-  // read the compass
-  int compass = Robot.compassRead();
-
-  // print out the sensor's value
-  Serial.println(compass);  
-  
-  // show the value on the robot's screen
-  Robot.drawCompass(compass);
-}
-