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
..
333fred	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
ab	…
absenth	…
adam	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
adnw_k_o_y	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
adnw_p_u_q	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
albert	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
alexjj	…
algernon	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
andrew_osx	…
belak	…
bepo	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
bepo_alt	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
bepo_csa	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
berfarah	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
bocaj	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
bryan	…
choromanski	…
coderkun_neo2	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
colemak	…
colemak_code_friendly	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
colemak_osx_pc_no	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
colemak_programmer	…
common_nighthawk	…
csharp_dev	…
dave	…
deadcyclo	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
dragon788	…
drashna	Remove backwards compatibility of debounce names (#13877 )	2021-08-09 19:46:18 +01:00
dvorak	…
dvorak_emacs	…
dvorak_emacs_software	…
dvorak_intl_squisher	…
dvorak_plover	…
dvorak_programmer	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
dvorak_programmer_swe	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
dvorak_spanish	…
dvorak_svorak_a5	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
emacs_osx_dk	…
french_hacker	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
galson	…
german	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
german-kinergo	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
german-lukas	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
german-manuneo	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
guni	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
haegin	…
ishigoya-jp	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
issmirnov	[Bug] Develop - Change uint32_t to layer_state_t (#13596 )	2021-07-19 09:50:55 -07:00
italian	…
j3rn	…
jackhumbert	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
jacobono	…
jafo	…
jgarr	…
josh	…
kastyle	…
kejadlen	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
kines-ish	…
kristian	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
manna-harbour_miryoku	[Keymap] Update Miryoku (#13307 )	2021-07-03 09:09:02 -07:00
maz	…
mclennon_osx	…
meagerfindings	…
mpiechotka	…
msc	…
naps62	…
neo2_on_qwertz_hardware	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
norwegian_programmer_osx_pc	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
norwegian_programmer_osx_pc_colemak	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
ordinary	…
ordinary_osx	…
osx_de	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
osx_de_adnw_koy	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
osx_de_experimental	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
osx_fr	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
osx_kinesis_pnut	…
osx_neo2	…
osx_whiskey_tango_foxtrot_capslock	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
phoenix	…
plover	…
plums	…
qwerty_code_friendly	[Bug] Develop - Change uint32_t to layer_state_t (#13596 )	2021-07-19 09:50:55 -07:00
replicaJunction	…
reset_eeprom	…
robot_test_layout	…
romanzolotarev-norman-osx	…
romanzolotarev-norman-plover-osx	…
romanzolotarev-norman-plover-osx-hjkl	…
romanzolotarev-norman-qwerty-osx	…
sethbc	…
siroken3	…
sneako	…
software_neo2	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
supercoder	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
swedish	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
swedish-lindhe	`keymap_extras`: Remove deprecated defines (#12949 )	2021-07-06 09:05:11 +10:00
swissgerman	…
techtomas	…
teckinesis	…
tkuichooseyou	…
tm2030	…
tonyabra_osx	…
townk_osx	Remove Full Bootmagic (#13846 )	2021-08-06 23:59:56 -07:00
twentylives_dvorak_with_hebrew	…
twey	…
videck	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
win10_writers-block	Remove QMK_KEYBOARD_CONFIG_H (#11576 )	2021-01-22 19:32:10 +00:00
workman_osx_mdw	Migrate more `fn_actions` stuff (#13502 )	2021-07-15 03:52:45 +10:00
xyverz	…
yoruian	…
zweihander-macos	…
layout.json	…
readme.md	…

readme.md

ergodox

LAYOUT_ergodox