diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
| commit | 7bec943043b8d03482e9f4ffc69cc63b9fc4a18a (patch) | |
| tree | e138b4d121f2196d3983e1643cab4381ee729c9b /quantum/dynamic_macro.h | |
| parent | c0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff) | |
| parent | 26ea090190b815862f108903e5f41f20c6d16d66 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
Diffstat (limited to 'quantum/dynamic_macro.h')
0 files changed, 0 insertions, 0 deletions