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

Jump to bottom

Update 333fred's keymap for Zen #3690

Merged
merged 1 commit into from
Aug 20, 2018
Merged

Update 333fred's keymap for Zen #3690

merged 1 commit into from
Aug 20, 2018

Conversation

noroadsleft
Copy link
Member

Updated the keymap that I failed to update in #3677.

@drashna
Copy link
Member

drashna commented Aug 19, 2018

@333fred, this okay?

@drashna drashna added the keymap label Aug 19, 2018
333fred
333fred suggested changes Aug 20, 2018
View reviewed changes
Copy link
Contributor

@333fred 333fred left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a bunch of unrelated whitespace changes in this that'll break line history. Please just do the macro change.

@noroadsleft
macro change per @333fred
e797ead 
Reset file to upstream/master, update only macro name (KEYMAP to LAYOUT).
@noroadsleft
Copy link
Member Author

This should do.

@drashna
Copy link
Member

drashna commented Aug 20, 2018

Thanks!

@drashna drashna merged commit dbef2ad into qmk:master Aug 20, 2018
@noroadsleft noroadsleft deleted the cf/zen branch August 20, 2018 17:24
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Aug 21, 2018
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
d5e0531 
* 'master' of https://github.com/qmk/qmk_firmware:
  Keymap: Update 333fred's keymap for Zen (qmk#3690)
alexey-danilov pushed a commit to alexey-danilov/qmk_firmware that referenced this pull request Sep 6, 2018
@noroadsleft
Keymap: Update 333fred's keymap for Zen (qmk#3690)
2c1ab87 
Reset file to upstream/master, update only macro name (KEYMAP to LAYOUT).
ChrissiQ pushed a commit to ChrissiQ/qmk_firmware that referenced this pull request Sep 25, 2018
@noroadsleft @ChrissiQ
Keymap: Update 333fred's keymap for Zen (qmk#3690)
6941ab7 
Reset file to upstream/master, update only macro name (KEYMAP to LAYOUT).
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
@noroadsleft @yamad
Keymap: Update 333fred's keymap for Zen (qmk#3690)
6ba89f3 
Reset file to upstream/master, update only macro name (KEYMAP to LAYOUT).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@333fred 333fred 333fred approved these changes

Assignees
No one assigned
Labels
keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@noroadsleft @drashna @333fred