qmk_firmware - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	RESET -> QK_BOOT user keymaps (#17940)	Joel Challis	2022-08-21	1	-1/+1
\|
*	[Keymap] Some updates to mechmerlin userspace and keymaps (#14711)	MechMerlin	2021-10-05	2	-17/+13
\|
*	Merlin's userspace updates (#8074)	MechMerlin	2020-02-03	2	-4/+14
\|
*	[Keymap] Userspace Keymap Updates (#5215)	MechMerlin	2019-02-28	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* enable velocikey for my userspace and explicitly for my 75% layout * add guards to only turn on RGB stuff if the RGB pin is actually defined * update 60_ansi keymap * update the 60_ansi_split_bs_rshift keymap * update 66_ansi keymap * update docs * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/66_ansi/mechmerlin/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * Update layouts/community/60_ansi/mechmerlin-ansi/keymap.c Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com> * remove my attempt to find a good way to detect this * move audio clicky into user space and do feature setting per keyboard * fixup 66_ansi keymap * update changelog * update readme
*	[Keymap] update keymap and readme for my 75% layout (#5166)	MechMerlin	2019-02-18	2	-7/+8
\|
*	Keymap: Merlin Learns to QMK (#3820)	MechMerlin	2018-08-31	2	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix up my keymaps to use more QMK features * update 60_ansi readme * add the start of my userspace * begin to use my new userspace * use more of my userspace * spread userspace love to my clueboard * spread userspace love to 75 layout * add a fairly vanilla readme * put the FNX into a userspace incase I ever want to use it for something else * respond to drashna's code review comments
*	Introduce new 75_ansi standard layout (#3738)	MechMerlin	2018-08-24	2	-0/+33
	* introduce new layout 75_ansi * use the new 75_ansi layout for my octagon v2