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

Fix dk60 compiler issue on newer compiler versions #5444

Merged
merged 1 commit into from
Mar 19, 2019

Conversation

drashna
Copy link
Member

@drashna drashna commented Mar 19, 2019

Types of Changes

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

Copy link
Contributor

@mechmerlin mechmerlin left a comment

Choose a reason for hiding this comment

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

Thanks!

@mechmerlin mechmerlin merged commit 29bfd63 into qmk:master Mar 19, 2019
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Mar 19, 2019
* master: (476 commits)
  [Keymap] Boy_314's Halfnhalf layout update (qmk#5441)
  [Keyboard] Remove unnecessary IS_COMMAND definitions from a couple of boards (qmk#5269)
  Cleanup Default Keymaps  (qmk#5442)
  Fix dk60 compiler issue on newer compiler versions (qmk#5444)
  correct typo in eeprom split target for dfu (qmk#5445)
  [Docs] Recursively clone qmk_firmware repo (qmk#5378)
  [Docs] Smallish overhaul of the docs (qmk#5281)
  [Keyboard] Reduce compile size of the Lily58 Keyboard (qmk#5412)
  [Docs] Add music_map to audio documentation (qmk#5419)
  [Keymap] PyroL's TMO50 layout update (qmk#5435)
  [Keymap] Add vim-style keymap for lets split (qmk#5399)
  [Keyboard] CannonKeys Instant60 Keyboard (qmk#5433)
  [Keymap] add android studio keyboard shortcuts to dvorak 42 key atreus / ergodox layouts (qmk#5423)
  [Keymap] Updated layout after some months of testing. (qmk#5427)
  [Keyboard] Corrected layout for top row keys (qmk#5429)
  [Keyboard] Add Jot50 handwired board (qmk#5431)
  [Keyboard] layout fixed in jotanck.h (qmk#5432)
  [Keyboard] correct indicator light states (qmk#5434)
  [Keyboard] Fix matrix positions for HotDox (qmk#5437)
  [Keymap] Arkag Userspace Update (qmk#5438)
  ...

# Conflicts:
#	keyboards/keebio/iris/rules.mk
#	layouts/community/ortho_4x12/grahampheath/keymap.c
chie4hao pushed a commit to chie4hao/qmk_firmware that referenced this pull request Mar 28, 2019
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 31, 2019
danielo515 pushed a commit to danielo515/qmk_firmware that referenced this pull request May 15, 2019
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
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.

None yet

2 participants