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

my xd60 rev3 layout #10089

Merged
merged 5 commits into from
Aug 19, 2020
Merged

my xd60 rev3 layout #10089

merged 5 commits into from
Aug 19, 2020

Conversation

fvolpe83
Copy link
Contributor

@fvolpe83 fvolpe83 commented Aug 19, 2020

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: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • 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).

keyboards/xd60/keymaps/shura30/keymap.c Outdated Show resolved Hide resolved
keyboards/xd60/keymaps/shura30/keymap.c Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team August 19, 2020 09:50
fvolpe83 and others added 2 commits August 19, 2020 13:55
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@fauxpark fauxpark requested a review from a team August 19, 2020 11:59
@fvolpe83 fvolpe83 requested review from fauxpark and removed request for a team August 19, 2020 12:09
@fauxpark fauxpark requested a review from a team August 19, 2020 12:21
@fauxpark fauxpark requested a review from a team August 19, 2020 12:21
@noroadsleft noroadsleft merged commit c23e6df into qmk:master Aug 19, 2020
@noroadsleft
Copy link
Member

Thanks!

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

Fixing Your Branch will walk you through fixing up your master branch moving forward. If you need any help with this just ask.

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Aug 20, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (126 commits)
  [Keyboard] AJisai74 (qmk#10021)
  [Keyboard] HolySwitch Co Southpaw75 (qmk#10011)
  [Keymap] update dvorak_42_key keymaps for atreus and ergodox_ez: add VSCode shortcuts (qmk#10054)
  Fix typo in docs/feature_dynamic_macros (qmk#10085)
  [Keymap] VIA keymap for Cannonkeys Ortho60 (qmk#10086)
  [Keymap] xd60:shura30 (qmk#10089)
  Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zergo/keymaps/default/keymap.c (qmk#10094)
  [Keymap] added dbroqua keymap for kbdfans/kbd6x (qmk#10072)
  [Keyboard] Vision keyboard by SatT (qmk#9768)
  60_ansi_arrows Community Layout; mrsendyyk keymaps for dz60 and maartenwut/eon65 (qmk#9993)
  [Keyboard] add Xelus Valor (qmk#10079)
  [Keyboard] Add support for keyboard 'Bolt' (qmk#10046)
  [Keymap] update kejadlen keymaps (qmk#9954)
  [Keymap] jotix_ortho_4x12_layout (qmk#10075)
  Changes to thevankeyboards/minivan:king keymap (qmk#10032)
  Refactor Adelais PCB (qmk#10069)
  [Keyboard] NK87 (qmk#9965)
  Update keymap for Keebio/iris4/rev4 (qmk#10062)
  Dawn60 update that breaks travis keyboard builds (qmk#10082)
  add VIA keymap for boardsource/3x4 (qmk#10043)
  ...
nicocesar pushed a commit to nicocesar/qmk_firmware that referenced this pull request Sep 6, 2020
* added my xd60 layout

* added my xd60 layout

* Update keyboards/xd60/keymaps/shura30/keymap.c

* Update keyboards/xd60/keymaps/shura30/keymap.c

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

Successfully merging this pull request may close these issues.

3 participants