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

3 files changed, 1 insertions, 7 deletions

diff --git a/keyboards/fc660c/README.md b/keyboards/fc660c/README.md
index 5cb9bcea48..638c559577 100644
--- a/keyboards/fc660c/README.md
+++ b/keyboards/fc660c/README.md
@@ -13,7 +13,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make fc660c: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.
 
 To flash the firmware, press the reset button on the controller and run:
 
diff --git a/keyboards/fc660c/keymaps/dbroqua/keymap.c b/keyboards/fc660c/keymaps/dbroqua/keymap.c
index 62ef234c75..0c6931a3f2 100644
--- a/keyboards/fc660c/keymaps/dbroqua/keymap.c
+++ b/keyboards/fc660c/keymaps/dbroqua/keymap.c
@@ -42,6 +42,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
     )
 };
-
-const uint16_t PROGMEM fn_actions[] = {
-};
diff --git a/keyboards/fc660c/keymaps/default/keymap.c b/keyboards/fc660c/keymaps/default/keymap.c
index eae07c08b1..bf890c2c1d 100644
--- a/keyboards/fc660c/keymaps/default/keymap.c
+++ b/keyboards/fc660c/keymaps/default/keymap.c
@@ -32,6 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,_______,_______,                _______,                _______,_______,MO(1),       _______,_______,_______
     )
 };
-
-const uint16_t PROGMEM fn_actions[] = {
-};