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

diff --git a/libraries/Robot_Control/examples/learn/Beep/Beep.ino b/libraries/Robot_Control/examples/learn/Beep/Beep.ino
deleted file mode 100644
index 1a78673..0000000
--- a/libraries/Robot_Control/examples/learn/Beep/Beep.ino
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Beep
- 
- Test different pre-configured beeps on
- the robot's speaker.
-
- Possible beeps are:
- - BEEP_SIMPLE
- - BEEP_DOUBLE
- - BEEP_LONG
- 
- 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 sound speaker
-  Robot.beginSpeaker();
-}
-void loop() {
-  Robot.beep(BEEP_SIMPLE);
-  delay(1000);
-  Robot.beep(BEEP_DOUBLE);
-  delay(1000);
-  Robot.beep(BEEP_LONG);
-  delay(1000);
-}