eqmk/qmk_firmware
1
0
Fork 0
forked from mfulz_github/qmk_firmware
Code Issues Pull Requests Projects Releases Wiki Activity
qmk_firmware/layouts/community
History
James Young 7bec943043
Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch
2021-08-09 12:14:22 -07:00
..
60_ansi
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
60_ansi_arrow_split_bs_7u_spc/mrsendyyk
[Keymap] Add 60_ansi_arrow_split_bs_7u_spc layout & keymap (#11329)
2021-03-05 10:30:06 -08:00
60_ansi_split_bs_rshift
[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)
2021-08-03 09:39:43 -07:00
60_hhkb
Remove QMK_KEYBOARD_CONFIG_H (#11576)
2021-01-22 19:32:10 +00:00
60_iso
strip fn_actions
2021-01-30 13:11:33 -08:00
60_tsangan_hhkb
[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)
2021-08-03 09:39:43 -07:00
65_ansi
Remove the extra comma in the macro in the community keymap (#9175)
2020-06-02 06:29:28 +10:00
65_ansi_blocker
[Keymap] Add stanrc85 community layout (#13338)
2021-07-03 01:06:21 -07:00
65_ansi_blocker_split_bs
[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)
2021-08-03 09:39:43 -07:00
66_ansi
bring the xyverz keymap inline with LAYOUT_66_ansi
2021-01-30 13:11:33 -08:00
68_ansi
Merlin's userspace updates (#8074)
2020-02-03 22:37:01 +01:00
75_ansi
[Keymap] Revamp spidey3 userspace and keymaps (#11768)
2021-02-06 13:04:25 -08:00
alice/stanrc85-alice
[Keymap] stanrc85 keymap updates (#12184)
2021-03-16 19:44:13 -07:00
ergodox
Merge remote-tracking branch 'upstream/master' into develop
2021-08-09 12:14:22 -07:00
numpad_5x4/mrsendyyk
mrsendyyk Keymap Cleanup (#10539)
2020-10-17 12:14:02 -07:00
numpad_5x6
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
ortho_1x1
[Keyboard] Fix error_log complaint about handwired/onekey layout macro (#9263)
2020-06-07 22:49:18 -07:00
ortho_1x4
Six Pack and ortho_ layout updates (#13587)
2021-07-19 17:30:09 -07:00
ortho_2x3
Six Pack and ortho_ layout updates (#13587)
2021-07-19 17:30:09 -07:00
ortho_2x6
Six Pack and ortho_ layout updates (#13587)
2021-07-19 17:30:09 -07:00
ortho_3x10
Wanleg tuneup / additions (#5752)
2019-05-01 20:29:00 -07:00
ortho_4x4
jotix layouts (#8644)
2020-04-05 23:15:24 +01:00
ortho_4x10/manna-harbour_miryoku
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
ortho_4x12
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
ortho_5x5
Six Pack and ortho_ layout updates (#13587)
2021-07-19 17:30:09 -07:00
ortho_5x10
Big Switch and 5x5 edits (#4168)
2018-10-19 11:01:40 -07:00
ortho_5x12
Remove Full Bootmagic (#13846)
2021-08-06 23:59:56 -07:00
ortho_5x14
Audio system overhaul (#11820)
2021-02-15 09:40:38 +11:00
ortho_5x15
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
planck_mit
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
split_3x5_3/manna-harbour_miryoku
[Keymap] Update Miryoku (#13307)
2021-07-03 09:09:02 -07:00
split_3x6_3
[Keymap] Drashna split transport improvement (#13905)
2021-08-07 21:40:48 -07:00
tkl_ansi
Add support for the DURGOD Taurus K320 keyboard (#11399)
2021-01-26 04:30:17 +11:00