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.

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

add new pcb - chlx ppr merro #23014

Merged
merged 26 commits into from
Feb 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
eec0d83
add ppr files
Feb 2, 2024
d7b8f09
update readme
Feb 4, 2024
6692560
update imgur link
Feb 4, 2024
97dfdcc
Update keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
gaclee3b Feb 4, 2024
802a209
Update keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
gaclee3b Feb 4, 2024
703f90f
Update keyboards/chlx/ppr_merro60/readme.md
gaclee3b Feb 4, 2024
81117d4
Update keyboards/chlx/ppr_merro60/readme.md
gaclee3b Feb 4, 2024
42a3582
Update keyboards/chlx/ppr_merro60/rules.mk
gaclee3b Feb 4, 2024
232fe5e
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
c8023c6
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
a66084d
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
5cd21c4
run 'qmk format-json -i info.json'
Feb 4, 2024
a087b1d
Merge branch 'master' into chlx_ppr_merro
gaclee3b Feb 4, 2024
4a6ed10
Update keyboards/chlx/ppr_merro60/readme.md
gaclee3b Feb 4, 2024
3e36200
remove 60_ansi_split_bs_rshift from list of avail layouts
Feb 4, 2024
d257f31
Update keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
gaclee3b Feb 4, 2024
682c4bd
Update keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
gaclee3b Feb 4, 2024
f3fa96e
Update keyboards/chlx/ppr_merro60/readme.md
gaclee3b Feb 4, 2024
c5abf8a
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
059c1c9
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
f1bd7cb
Update keyboards/chlx/ppr_merro60/info.json
gaclee3b Feb 4, 2024
6dd6389
add ansi variants
Feb 4, 2024
8a1e3c5
row / col was flipped from last working version. local corruption. up…
Feb 5, 2024
b070096
Merge branch 'master' into chlx_ppr_merro
gaclee3b Feb 10, 2024
50b17ae
Merge branch 'master' into chlx_ppr_merro
gaclee3b Feb 12, 2024
386edb1
Apply suggestions from code review
waffle87 Feb 16, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'master' into chlx_ppr_merro
  • Loading branch information
gaclee3b authored Feb 4, 2024
commit a087b1d55f088bad5e37d6ee915497f1af724c60

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.