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/laplace | |
parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
download | qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.zip |
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/laplace')
-rw-r--r-- | keyboards/laplace/keymaps/bakingpy/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/laplace/keymaps/default/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/laplace/readme.md | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/keyboards/laplace/keymaps/bakingpy/rules.mk b/keyboards/laplace/keymaps/bakingpy/rules.mk index 457a3d01d4..e69de29bb2 100644 --- a/keyboards/laplace/keymaps/bakingpy/rules.mk +++ b/keyboards/laplace/keymaps/bakingpy/rules.mk @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/laplace/keymaps/default/rules.mk b/keyboards/laplace/keymaps/default/rules.mk index 457a3d01d4..e69de29bb2 100644 --- a/keyboards/laplace/keymaps/default/rules.mk +++ b/keyboards/laplace/keymaps/default/rules.mk @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/laplace/readme.md b/keyboards/laplace/readme.md index 71b3280082..7871992f76 100644 --- a/keyboards/laplace/readme.md +++ b/keyboards/laplace/readme.md @@ -15,6 +15,6 @@ Example of flashing this keyboard: make laplace:default:avrdude -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. A build guide for this keyboard can be found here: [Keebio Build Guides](https://docs.keeb.io) |