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

2 files changed, 0 insertions, 69 deletions

diff --git a/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino b/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino
deleted file mode 100644
index 543c06c..0000000
--- a/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Turn Test
- 
- Check if the robot turns a certain amount of degrees.
- 
- 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();
-}
-
-void loop(){  
-  Robot.turn(50); //turn 50 degrees to the right
-  Robot.motorsStop();
-  delay(1000);
-
-  Robot.turn(-100); //turn 100 degrees to the left
-  Robot.motorsStop();
-  delay(1000);
-}
diff --git a/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig b/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig
deleted file mode 100644
index 4e3624f..0000000
--- a/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Turn Test
- 
- Check if the robot turns a certain amount of degrees.
- 
- 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();
-}
-
-<<<<<<< HEAD
-void loop() {  
-  Robot.turn(50);  //turn 50 degrees to the right
-=======
-void loop(){  
-  Robot.turn(50);//turn 50 degrees to the right
-  Robot.motorsStop();
->>>>>>> f062f704463222e83390b4a954e211f0f7e6e66f
-  delay(1000);
-
-  Robot.turn(-100);//turn 100 degrees to the left
-  Robot.motorsStop();
-  delay(1000);
-}