This repository has been archived on 2025-01-28. You can view files and clone it, but cannot push or open issues or pull requests.
James Young 7bec943043
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
2021-08-09 12:14:22 -07:00
..
2020-05-19 22:05:32 +01:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2020-01-26 23:26:40 -05:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-01-30 13:11:33 -08:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2020-07-21 17:08:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2020-07-08 21:57:11 +01:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2021-08-06 23:59:56 -07:00
2019-05-01 20:29:00 -07:00
2021-08-06 23:59:56 -07:00

User space

This is a place for users to put code that they might use between keyboards. If you build the keymap mine, /users/mine/rules.mk will be included in your build, and /users/mine/ will be in your path - keep these things in mind when naming your files and referencing them from other places.