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

diff --git a/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino b/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
deleted file mode 100644
index d1e29bd..0000000
--- a/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * EEPROM Clear
- *
- * Sets all of the bytes of the EEPROM to 0.
- * This example code is in the public domain.
-
- */
-
-#include <EEPROM.h>
-
-void setup()
-{
-  // write a 0 to all 512 bytes of the EEPROM
-  for (int i = 0; i < 512; i++)
-    EEPROM.write(i, 0);
-    
-  // turn the LED on when we're done
-  digitalWrite(13, HIGH);
-}
-
-void loop()
-{
-}