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

diff --git a/libraries/Robot_Motor/Multiplexer.h b/libraries/Robot_Motor/Multiplexer.h
deleted file mode 100644
index a0c4c5c..0000000
--- a/libraries/Robot_Motor/Multiplexer.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef Multiplexer_h
-#define Multiplexer_h
-
-#if ARDUINO >= 100
-#include "Arduino.h"
-#else
-#include "WProgram.h"
-#endif
-
-class Multiplexer{
-	public:
-		void begin(uint8_t* selectors, uint8_t Z, uint8_t length);
-		void selectPin(uint8_t num);
-		int getAnalogValue();
-		int getAnalogValueAt(uint8_t num);
-		bool getDigitalValue();
-		bool getDigitalValueAt(uint8_t num);
-	private:
-		uint8_t selectors[4];
-		uint8_t pin_Z;
-		uint8_t length;
-};
-
-#endif