diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
| commit | c9ba618654417ec115809a031d315f8327c79ad4 (patch) | |
| tree | cd5b907af5bebde7062897ff847e473232ed1214 /keyboards/zen | |
| parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
| parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
# quantum/matrix.c
Diffstat (limited to 'keyboards/zen')
| -rw-r--r-- | keyboards/zen/keymaps/default/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/jwlawrence/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/zen/keymaps/xyverz/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/zen/readme.md | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/keyboards/zen/keymaps/default/rules.mk b/keyboards/zen/keymaps/default/rules.mk index 22b6ec4766..73142a1680 100644 --- a/keyboards/zen/keymaps/default/rules.mk +++ b/keyboards/zen/keymaps/default/rules.mk @@ -1,6 +1,3 @@ RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/zen/keymaps/jwlawrence/rules.mk b/keyboards/zen/keymaps/jwlawrence/rules.mk index 22b6ec4766..73142a1680 100644 --- a/keyboards/zen/keymaps/jwlawrence/rules.mk +++ b/keyboards/zen/keymaps/jwlawrence/rules.mk @@ -1,6 +1,3 @@ RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/zen/keymaps/xyverz/rules.mk b/keyboards/zen/keymaps/xyverz/rules.mk index 22b6ec4766..73142a1680 100644 --- a/keyboards/zen/keymaps/xyverz/rules.mk +++ b/keyboards/zen/keymaps/xyverz/rules.mk @@ -1,6 +1,3 @@ RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/zen/readme.md b/keyboards/zen/readme.md index beb5e13ac1..0fb0ffb3b6 100644 --- a/keyboards/zen/readme.md +++ b/keyboards/zen/readme.md @@ -17,4 +17,4 @@ Make example for this keyboard (after setting up your build environment): make zen/rev1:default -See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. |