]> git.donarmstrong.com Git - qmk_firmware.git/commit
Keymap: Merlin Learns to QMK (#3820)
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Fri, 31 Aug 2018 21:49:18 +0000 (14:49 -0700)
committerDrashna Jaelre <drashna@live.com>
Fri, 31 Aug 2018 21:49:18 +0000 (14:49 -0700)
commitfb79015049ebd1309cd4f69a7584db614f50d1db
treee298559d4a92e0123083d54d1e50df91debdb1bd
parentacc06a0848380fbeb2688d18bc19fee07797046c
Keymap: Merlin Learns to QMK (#3820)

* 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
13 files changed:
layouts/community/60_ansi/mechmerlin-ansi/keymap.c
layouts/community/60_ansi/mechmerlin-ansi/readme.md
layouts/community/60_ansi/mechmerlin-ansi/rules.mk [new file with mode: 0644]
layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/rules.mk [new file with mode: 0644]
layouts/community/66_ansi/mechmerlin/keymap.c
layouts/community/66_ansi/mechmerlin/rules.mk [new file with mode: 0644]
layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
layouts/community/75_ansi/mechmerlin-75_ansi/rules.mk [new file with mode: 0644]
users/mechmerlin/mechmerlin.c [new file with mode: 0644]
users/mechmerlin/mechmerlin.h [new file with mode: 0644]
users/mechmerlin/readme.md [new file with mode: 0644]
users/mechmerlin/rules.mk [new file with mode: 0644]