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

Port over Noxary 268.2 from Rosakiin's Noxary Firmware #4354

Merged
merged 9 commits into from
Nov 6, 2018

Conversation

mechmerlin
Copy link
Contributor

With this, we'll have all 268s accounted for in QMK, so people won't be confused anymore. Or will they? mwahahhahaa.

keyboards/noxary/268_2/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/noxary/268_2/n268_2.c Outdated Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented Nov 6, 2018

Thanks!

@drashna drashna merged commit f01a809 into qmk:master Nov 6, 2018
@mechmerlin mechmerlin deleted the feature/268_2 branch November 8, 2018 15:42
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Nov 9, 2018
* 'master' of https://github.com/qmk/qmk_firmware: (95 commits)
  Keymap: dlg's tada68 keymap (qmk#4289)
  relocate 40percent.club boards to new parent folder (qmk#4380)
  Keyboard: Add 30wer config and keymap (qmk#4386)
  Keyboard: fix ifdef for crkbd's default/keymap.c
  Add Layout-b for GH60 satan (qmk#4123)
  Fix misspelled make option, format rules.mk files (qmk#4382)
  Configurable Rainbow Swirl range (qmk#4376)
  Add xd75/billypython keymap (qmk#4381)
  Add Tragicforce 68 layout for split backspace and add configurator layouts (qmk#4378)
  Port over Noxary 268.2 from Rosakiin's Noxary Firmware (qmk#4354)
  Improve wording, punctuation and capitalization in newbs_getting_started guide (qmk#4342)
  Commit my DZ60 keymap (qmk#4375)
  Add whitefox/billypython keymap (qmk#4374)
  Helix-serial.c configuration improvement (qmk#4370)
  separated all my changes into separate files, working on generalizing my relativity macros. (qmk#4368)
  Zinc :  Update to latest serial.c qmk#4278 (qmk#4361)
  Add localized LED flash effect on keypress to Massdrop ALT (qmk#4340)
  Fix Spacing issue in makefile that breaks Terminal config
  mapdev's Espectro layout (qmk#4366)
  command.h include was not set correctly
  ...
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Nov 17, 2018
* port over 268.2 from Noxary Firmware

* rename files

* update readme

* put rozakiin's ame in more places

* add configurator support

* Update keyboards/noxary/268_2/n268_2.c

Co-Authored-By: mechmerlin <[email protected]>

* Update keyboards/noxary/268_2/keymaps/default/keymap.c

Co-Authored-By: mechmerlin <[email protected]>

* rename 268_2 keyboard files
cd-glacier pushed a commit to cd-glacier/qmk_firmware that referenced this pull request Nov 26, 2018
* port over 268.2 from Noxary Firmware

* rename files

* update readme

* put rozakiin's ame in more places

* add configurator support

* Update keyboards/noxary/268_2/n268_2.c

Co-Authored-By: mechmerlin <[email protected]>

* Update keyboards/noxary/268_2/keymaps/default/keymap.c

Co-Authored-By: mechmerlin <[email protected]>

* rename 268_2 keyboard files
rseymour pushed a commit to rseymour/qmk_firmware that referenced this pull request Mar 13, 2019
* port over 268.2 from Noxary Firmware

* rename files

* update readme

* put rozakiin's ame in more places

* add configurator support

* Update keyboards/noxary/268_2/n268_2.c

Co-Authored-By: mechmerlin <[email protected]>

* Update keyboards/noxary/268_2/keymaps/default/keymap.c

Co-Authored-By: mechmerlin <[email protected]>

* rename 268_2 keyboard files
djthread pushed a commit to djthread/qmk_firmware that referenced this pull request Mar 17, 2019
* port over 268.2 from Noxary Firmware

* rename files

* update readme

* put rozakiin's ame in more places

* add configurator support

* Update keyboards/noxary/268_2/n268_2.c

Co-Authored-By: mechmerlin <[email protected]>

* Update keyboards/noxary/268_2/keymaps/default/keymap.c

Co-Authored-By: mechmerlin <[email protected]>

* rename 268_2 keyboard files
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