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

diff --git a/libraries/TFT/TFT.cpp b/libraries/TFT/TFT.cpp
deleted file mode 100644
index 57f71f2..0000000
--- a/libraries/TFT/TFT.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "TFT.h"
-
-#if (USB_VID == 0x2341) && (USB_PID == 0x803C) // are we building for Esplora?
-TFT EsploraTFT(7, 0, 1);
-#endif
-
-TFT::TFT(uint8_t CS, uint8_t RS, uint8_t RST) 
-  : Adafruit_ST7735(CS, RS, RST)
-{
-  // as we already know the orientation (landscape, therefore rotated),
-  // set default width and height without need to call begin() first.
-  _width = ST7735_TFTHEIGHT;
-  _height = ST7735_TFTWIDTH;
-}
-
-void TFT::begin() {
-  initR(INITR_REDTAB);
-  setRotation(1);
-}