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 Maxim keymap for Fourier #4534

Merged
merged 6 commits into from
Jan 26, 2019
Merged

Add Maxim keymap for Fourier #4534

merged 6 commits into from
Jan 26, 2019

Conversation

nooges
Copy link
Member

@nooges nooges commented Dec 2, 2018

No description provided.

keyboards/fourier/keymaps/maxim/keymap.c Outdated Show resolved Hide resolved
keyboards/fourier/keymaps/maxim/keymap.c Outdated Show resolved Hide resolved
keyboards/fourier/keymaps/maxim/config.h Outdated Show resolved Hide resolved
keyboards/fourier/keymaps/maxim/config.h Outdated Show resolved Hide resolved
keyboards/fourier/keymaps/maxim/config.h Show resolved Hide resolved
keyboards/fourier/keymaps/maxim/config.h Outdated Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented Jan 18, 2019

Looks like there is a merge conflict here.

Also, any update on the changes listed here?

@drashna drashna merged commit 4383864 into qmk:master Jan 26, 2019
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jan 27, 2019
* 'master' of https://github.com/qmk/qmk_firmware:
  Fix Command feature: use get_mods() instead of keyboard_report->mods (qmk#4955)
  [Keymap] Small improvements to Maxr1998's Contra keymap (qmk#4952)
  [Keymap] Minor updates to my dz60 keymap (qmk#4943)
  [Keyboard] UniGo66 keyboard added (qmk#4913)
  [Keymap] Move Iris via support to Via keymap (qmk#4893)
  Adds a default value for IS_COMMAND for COMMAND feature (qmk#4301)
  [Keyboard] drop unused i2c files (qmk#4948)
  [Keymap] Add Maxim keymap for Fourier (qmk#4534)
  use built-in arm stuff
  [Keymap] Add userspace files for vosechu (qmk#4912)
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Feb 2, 2019
* Add maxim keymap

* Add QMK DFU configuration to Fourier

* Update config.h

* Update keymap.c

* Update config.h
@nooges nooges deleted the maxim-keymap branch February 4, 2019 16:17
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
* Add maxim keymap

* Add QMK DFU configuration to Fourier

* Update config.h

* Update keymap.c

* Update config.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants