James Young 4279b14adf Merge remote-tracking branch 'upstream/master' into develop ...

Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk

2021-08-19 11:32:23 -07:00

..

bcat

[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)

2021-08-03 09:39:43 -07:00

bfiedler

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

bjohnson

Remove Full Bootmagic (#13846)

2021-08-06 23:59:56 -07:00

bramver

…

default

…

default65

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

default65macro

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

draevin

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

drashna_ms

Audio system overhaul (#11820)

2021-02-15 09:40:38 +11:00

georgepetri

[Bug] Develop - Change uint32_t to layer_state_t (#13596)

2021-07-19 09:50:55 -07:00

joestrong

Add joestrong keymap for quefrency rev 2 (#10503)

2020-10-02 17:26:05 +01:00

jonavin

[Keymap] Add jonavin user space / common functions (#13876)

2021-08-19 10:45:49 -07:00

kingwangwong

…

rogthefrog

[Keymap] Quefrency layout for rogthefrog (#11140)

2021-01-10 21:49:19 -08:00

unausgeschlafen

…

via

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

yoryer

…