Updated copyright headers and peer review fixes

6 files changed, 6 insertions, 11 deletions

diff --git a/keyboards/meira/config.h b/keyboards/meira/config.h
index e335db90f..88d5a31ea 100644
--- a/keyboards/meira/config.h
+++ b/keyboards/meira/config.h
@@ -43,11 +43,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_TIMER
 #define RGBLED_NUM 15    // Number of LEDs
 
-#ifdef SUBPROJECT_promicro
-    #include "promicro/config.h"
-#endif
-#ifdef SUBPROJECT_featherble
-    #include "featherble/config.h"
-#endif
-
 #endif
diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index ade3b2d57..ea26bedfa 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/meira/featherble/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 REPLACE_WITH_YOUR_NAME
+Copyright 2017 Cole Markham, WoodKeys.click
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/meira/keymaps/default/config.h
index f52a97bbc..97210115b 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/meira/keymaps/default/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+/* Copyright 2017 Cole Markham, WoodKeys.click
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c
index 823415920..cd6bf5580 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -1,4 +1,4 @@
-/* Copyright 2017 REPLACE_WITH_YOUR_NAME
+/* Copyright 2017 Cole Markham, WoodKeys.click
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/meira/promicro/config.h b/keyboards/meira/promicro/config.h
index 403a4e047..0c4e8f17f 100644
--- a/keyboards/meira/promicro/config.h
+++ b/keyboards/meira/promicro/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 REPLACE_WITH_YOUR_NAME
+Copyright 2017 Cole Markham, WoodKeys.click
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index fa80ca9d4..9f1d2fbae 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -82,3 +82,5 @@ endif
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
     TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
 endif
+
+DEFAULT_FOLDER = meira/promicro