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/CleanEEPROM/CleanEEPROM.ino b/libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino
deleted file mode 100644
index ae14bdd..0000000
--- a/libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Clean EEPROM
- 
- This example erases the user information stored on the
- external EEPROM memory chip on your robot.
-
- BEWARE, this will erase the following information:
- - your name
- - your robots name given by you
- - your city and country if you configured them via software
-
- EEPROMs shouldn't be rewritten too often, therefore the
- code runs only during setup and not inside loop.
- 
- 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();
-
-  // write empty strings for the different fields
-  Robot.userNameWrite("");
-  Robot.robotNameWrite("");
-  Robot.cityNameWrite("");
-  Robot.countryNameWrite(""); 
-}
-
-void loop(){
-  // do nothing  
-}