Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merc updates #12289

Merged
merged 12 commits into from
Apr 12, 2021
Merged

Merc updates #12289

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
db068ee
Initial commit of base IBKH firmware.
kylemccreery Jan 12, 2021
05621e0
Rebuilt firmware from scratch to avoid compilation errors from copyin…
kylemccreery Feb 11, 2021
fbca52f
Merge branch 'master' of https://github.com/kylemccreery/qmk_firmware
kylemccreery Feb 16, 2021
dc58864
Merge branch 'master' of github.com:qmk/qmk_firmware
kylemccreery Feb 20, 2021
e0be679
Merge branch 'master' of github.com:qmk/qmk_firmware
kylemccreery Feb 28, 2021
c94c23d
XMerge branch 'master' of ssh://github.com/qmk/qmk_firmware
kylemccreery Mar 5, 2021
40efb58
Merge branch 'master' of ssh://github.com/qmk/qmk_firmware
kylemccreery Mar 7, 2021
de00619
updating
kylemccreery Mar 7, 2021
02f3cf5
reduced firmware size of bongocat
kylemccreery Mar 9, 2021
ddf7bda
removed other projects that had been merged in
kylemccreery Mar 19, 2021
84cb8bb
Merge branch 'master' of github.com:qmk/qmk_firmware into merc_updates
kylemccreery Mar 19, 2021
2d20f95
Syncing mismatched chibios dirs
kylemccreery Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion keyboards/mechwild/mercutio/keymaps/bongocat/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
WPM_ENABLE = yes
VIA_ENABLE = yes
VIA_ENABLE = yes
MOUSEKEY_ENABLE = no