diff options
author | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
---|---|---|
committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/kinesis/keymaps/default_pretty | |
parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
download | qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.xz |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/kinesis/keymaps/default_pretty')
-rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/keymap.c | 5 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/rules.mk | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c index 58d749074..cb4cb6f26 100644 --- a/keyboards/kinesis/keymaps/default_pretty/keymap.c +++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c @@ -45,11 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - -const uint16_t PROGMEM fn_actions[] = { - -}; - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk index 93f927c7d..7a331cd53 100644 --- a/keyboards/kinesis/keymaps/default_pretty/rules.mk +++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk @@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -ifndef QUANTUM_DIR - include ../../../../Makefile -endif |