From 65fc448f00ef2f72c94b8645ff5b91d1846ba3b9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 14 Nov 2017 13:13:44 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/development' # Conflicts: # library.properties --- library.properties | 2 +- src/etl_arduino.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 src/etl_arduino.h diff --git a/library.properties b/library.properties index c890c5f1..5fe63b00 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=10.3.2 +version=10.3.3 author= John Wellbelove maintainer=John Wellbelove sentence=A C++ template library tailored for embedded systems. diff --git a/src/etl_arduino.h b/src/etl_arduino.h deleted file mode 100644 index 7efdae0c..00000000 --- a/src/etl_arduino.h +++ /dev/null @@ -1,8 +0,0 @@ - - -#ifndef __ETL_PLATFORM_ARDUINO__ - -#define COMPILER_GCC -#define PLATFORM_ARM - -#endif