diff options
| author |  Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
| commit | d18df8ef7a7e0528a29fdc96d4843ace54605121 (patch) | |
| tree | 44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/eco/config.h | |
| parent | 308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff) | |
| parent | 933701c2129c0c585ecd8ba37c41b091a7dc687f (diff) | |
| download | qmk_firmware-d18df8ef7a7e0528a29fdc96d4843ace54605121.tar.gz | |
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
# keyboards/bananasplit/Makefile
# keyboards/bananasplit/bananasplit.c
# keyboards/bananasplit/bananasplit.h
# keyboards/bananasplit/config.h
# keyboards/bananasplit/keymaps/default/keymap.c
# keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/eco/config.h')
| -rw-r--r-- | keyboards/eco/config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index af7e1822c..99b057496 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -73,5 +73,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef SUBPROJECT_rev1 #include "rev1/config.h" #endif +#ifdef SUBPROJECT_rev2 + #include "rev2/config.h" +#endif #endif |