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

diff --git a/libraries/Robot_Control/examples/learn/Melody/Melody.ino b/libraries/Robot_Control/examples/learn/Melody/Melody.ino
deleted file mode 100644
index 6c049a7..0000000
--- a/libraries/Robot_Control/examples/learn/Melody/Melody.ino
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- Melody
- 
- Plays a melody stored in a string. 
- 
- The notes and durations are encoded as follows:
-
- NOTES:
- c  play "C"
- C  play "#C"
- d  play "D"
- D  play "#D"
- e  play "E"
- f  play "F"
- F  play "#F"
- g  play "G"
- G  play "#G"
- a  play "A"
- A  play "#A"
- b  play "B"
- -  silence
-
- DURATIONS:
- 1  Set as full note
- 2  Set as half note
- 4  Set as quarter note
- 8  Set as eigth note
-
- SPECIAL NOTATION:
- .  Make the previous note 3/4 the length
-
- Circuit:
- * Arduino Robot
- 
- created 1 May 2013
- by X. Yang
- modified 12 May 2013
- by D. Cuartielles
- 
- This example is in the public domain
-
- This code uses the Squawk sound library designed by STG. For
- more information about it check: http://github.com/stg/squawk
- */
-
-#include <ArduinoRobot.h>
-
-void setup() {
-  // initialize the robot
-  Robot.begin();
-
-  // initialize the sound library
-  Robot.beginSpeaker();
-}
-
-void loop() {
-  // array containing the melody
-  char aTinyMelody[] = "8eF-FFga4b.a.g.F.8beee-d2e.1-";
-
-  // play the melody
-  Robot.playMelody(aTinyMelody);
-}