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 info.json #8723

Merged
merged 1 commit into from
Apr 8, 2020
Merged

Update info.json #8723

merged 1 commit into from
Apr 8, 2020

Conversation

Salicylic-acid3
Copy link
Contributor

Addressed a key shift in the QMK Configurator.

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@Salicylic-acid3
Update info.json
5d44b58 
Addressed a key shift in the QMK Configurator.
@mtei mtei added the keyboard label Apr 7, 2020
@mtei mtei requested a review from noroadsleft April 7, 2020 13:39
@zvecr zvecr requested a review from a team April 7, 2020 14:40
@Erovia Erovia merged commit ea7e40b into qmk:master Apr 8, 2020
@Erovia
Copy link
Member

Erovia commented Apr 8, 2020

Thanks for your contribution.

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Apr 9, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
e7edb70 
* 'master' of https://github.com/qmk/qmk_firmware: (53 commits)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  DennyTom's buttery_engine (qmk#8138)
  add via support for kira80 (qmk#8677)
  [Keyboard] Wheatfield Split75 (qmk#8511)
  Correctly handle json keymaps with ANY()
  ...
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath
dfdbdca 
* master: (3035 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...

# Conflicts:
#	layouts/community/ortho_4x12/grahampheath/keymap.c
#	lib/lufa
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath-iris
c625827 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into mygithub/launchpad
497cef9 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
@Salicylic-acid3 @HokieGeek
Update info.json (qmk#8723)
7bf890b 
Addressed a key shift in the QMK Configurator.
mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request Apr 12, 2020
@Salicylic-acid3 @mrlinuxfish
Update info.json (qmk#8723)
f652ac7 
Addressed a key shift in the QMK Configurator.
Quarren42 pushed a commit to Quarren42/qmk_firmware that referenced this pull request Apr 15, 2020
@Salicylic-acid3 @Quarren42
Update info.json (qmk#8723)
dde5c3a 
Addressed a key shift in the QMK Configurator.
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@Salicylic-acid3 @kujawakk
Update info.json (qmk#8723)
15e6085 
Addressed a key shift in the QMK Configurator.
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@Salicylic-acid3 @lorenzoernesto
Update info.json (qmk#8723)
9c85275 
Addressed a key shift in the QMK Configurator.
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@Salicylic-acid3 @sowbug
Update info.json (qmk#8723)
0fa24a3 
Addressed a key shift in the QMK Configurator.
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@Salicylic-acid3 @turky
Update info.json (qmk#8723)
0b75855 
Addressed a key shift in the QMK Configurator.
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@Salicylic-acid3 @jakobaa
Update info.json (qmk#8723)
5c9e705 
Addressed a key shift in the QMK Configurator.
thorstenweber83 pushed a commit to thorstenweber83/qmk_firmware that referenced this pull request Sep 2, 2020
@Salicylic-acid3 @thorstenweber83
Update info.json (qmk#8723)
22635ed 
Addressed a key shift in the QMK Configurator.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Erovia Erovia Erovia approved these changes

@zvecr zvecr zvecr approved these changes

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@Salicylic-acid3 @Erovia @zvecr @mtei