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

diff --git a/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino b/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino
deleted file mode 100644
index 2dbb57d..0000000
--- a/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino
+++ /dev/null
@@ -1,44 +0,0 @@
-
-/* 
- Stepper Motor Control - one revolution
- 
- This program drives a unipolar or bipolar stepper motor. 
- The motor is attached to digital pins 8 - 11 of the Arduino.
- 
- The motor should revolve one revolution in one direction, then
- one revolution in the other direction.  
- 
-  
- Created 11 Mar. 2007
- Modified 30 Nov. 2009
- by Tom Igoe
- 
- */
-
-#include <Stepper.h>
-
-const int stepsPerRevolution = 200;  // change this to fit the number of steps per revolution
-                                     // for your motor
-
-// initialize the stepper library on pins 8 through 11:
-Stepper myStepper(stepsPerRevolution, 8,9,10,11);            
-
-void setup() {
-  // set the speed at 60 rpm:
-  myStepper.setSpeed(60);
-  // initialize the serial port:
-  Serial.begin(9600);
-}
-
-void loop() {
-  // step one revolution  in one direction:
-   Serial.println("clockwise");
-  myStepper.step(stepsPerRevolution);
-  delay(500);
-  
-   // step one revolution in the other direction:
-  Serial.println("counterclockwise");
-  myStepper.step(-stepsPerRevolution);
-  delay(500); 
-}
-