From 7a76baa83e6246260d86e7b61ccfc8473b0f7ff0 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Fri, 9 Dec 2016 13:13:43 -0700 Subject: [PATCH] restore .am and gitignore --- .gitignore | 4 ---- Makefile.am | 1 - 2 files changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index cb2b9f28e..f14682518 100644 --- a/.gitignore +++ b/.gitignore @@ -189,7 +189,3 @@ wrapper/CSharp/x64/ # Visual Studio Code Workspace Files *.vscode - -# RIOT_OS workspace directories: -RIOT_Make/*/bin/ -RIOT_Make/*/*.c diff --git a/Makefile.am b/Makefile.am index 220813a13..09e1e7219 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,6 @@ include mcapi/zlib.X/nbproject/include.am include tirtos/include.am include scripts/include.am include IDE/include.am -include RIOT_Make/include.am if USE_VALGRIND TESTS_ENVIRONMENT=./valgrind-error.sh