diff options
author | Alex Ong <[email protected]> | 2019-01-26 11:36:28 +1100 |
---|---|---|
committer | Alex Ong <[email protected]> | 2019-01-26 11:36:28 +1100 |
commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/s60_x/keymaps | |
parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
download | qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.zip |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/s60_x/keymaps')
-rw-r--r-- | keyboards/s60_x/keymaps/ansi_qwertz/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/s60_x/keymaps/custom/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/s60_x/keymaps/plain/keymap.c | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk b/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk index cf50122526..1bcd7ea7f2 100644 --- a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk +++ b/keyboards/s60_x/keymaps/ansi_qwertz/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
\ No newline at end of file diff --git a/keyboards/s60_x/keymaps/custom/keymap.c b/keyboards/s60_x/keymaps/custom/keymap.c index 942fadf4a8..c98d14349f 100644 --- a/keyboards/s60_x/keymaps/custom/keymap.c +++ b/keyboards/s60_x/keymaps/custom/keymap.c @@ -24,5 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LSFT, HOME, Z, X, C, V, B, N, M, COMM, DOT, SLSH, END, RSFT, UP, \ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL), }; -const uint16_t PROGMEM fn_actions[] = {}; - diff --git a/keyboards/s60_x/keymaps/plain/keymap.c b/keyboards/s60_x/keymaps/plain/keymap.c index abf7ede2c4..3cdda75620 100644 --- a/keyboards/s60_x/keymaps/plain/keymap.c +++ b/keyboards/s60_x/keymaps/plain/keymap.c @@ -22,4 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \ LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL), }; -const uint16_t PROGMEM fn_actions[] = {}; |