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/IRArray/IRArray.ino b/libraries/Robot_Control/examples/learn/IRArray/IRArray.ino
deleted file mode 100644
index 36b4acf..0000000
--- a/libraries/Robot_Control/examples/learn/IRArray/IRArray.ino
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- IR array
- 
- Read the analog value of the IR sensors at the 
- bottom of the robot. The also-called line following 
- sensors are a series of pairs of IR sender/receiver
- used to detect how dark it is underneath the robot.
-
- The information coming from the sensor array is stored
- into the Robot.IRarray[] and updated using the Robot.updateIR()
- method.
- 
- 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 serial port
-  Serial.begin(9600);
-}
-
-void loop(){
-  // store the sensor information into the array 
-  Robot.updateIR();
-
-  // iterate the array and print the data to the Serial port
-  for(int i=0; i<5; i++){
-    Serial.print(Robot.IRarray[i]);
-    Serial.print(" ");
-  }
-  Serial.println("");
-}