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

diff --git a/libraries/Esplora/Beginners/EsploraTemperatureSensor/EsploraTemperatureSensor.ino b/libraries/Esplora/Beginners/EsploraTemperatureSensor/EsploraTemperatureSensor.ino
deleted file mode 100644
index 72bbf04..0000000
--- a/libraries/Esplora/Beginners/EsploraTemperatureSensor/EsploraTemperatureSensor.ino
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Esplora Temperature Sensor
- 
- This  sketch shows you how to read the Esplora's temperature sensor
- You can read the temperature sensor in Farhenheit or Celsius.
- 
- Created on 22 Dec 2012
- by Tom Igoe
- 
- This example is in the public domain.
- */
-#include <Esplora.h>
-
-void setup()
-{
-  Serial.begin(9600);      // initialize serial communications with your computer
-} 
-
-void loop()
-{
-  // read the temperature sensor in Celsius, then Fahrenheit:
-  int celsius = Esplora.readTemperature(DEGREES_C);
-  int fahrenheit = Esplora.readTemperature(DEGREES_F);
-
-  // print the results:
-  Serial.print("Temperature is: ");
-  Serial.print(celsius);
-  Serial.print(" degrees Celsius, or ");
-  Serial.print(fahrenheit);
-  Serial.println(" degrees Fahrenheit.");
-  Serial.println("     Fahrenheit = (9/5 * Celsius) + 32");
-
-  // wait a second before reading again:
-  delay(1000);
-}
-
-