mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-15 04:54:43 +00:00
7bec943043
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
|
||
|---|---|---|
| .. | ||
| 333fred | ||
| _example | ||
| ajp10304 | ||
| alfrdmalr | ||
| anderson | ||
| arkag | ||
| art | ||
| badger | ||
| bbaserdem | ||
| bcat | ||
| billypython | ||
| bocaj | ||
| brandonschlack | ||
| brett | ||
| callum | ||
| cbbrowne | ||
| cjuniet | ||
| csc027 | ||
| curry | ||
| cwebster2 | ||
| d4mation | ||
| danielo515 | ||
| datagrok | ||
| dennytom/chording_engine | ||
| devdev | ||
| dhertz | ||
| doogle999 | ||
| draevin | ||
| drashna | ||
| dshields | ||
| dudeofawesome | ||
| edvorakjp | ||
| ericgebhart | ||
| gary | ||
| gordon | ||
| greatwizard | ||
| haervig | ||
| hvp | ||
| ibnuda | ||
| imchipwood | ||
| ishtob | ||
| issmirnov | ||
| jackhumbert | ||
| jarred | ||
| jdelkins | ||
| kageurufu | ||
| klackygears | ||
| konstantin | ||
| kuatsure | ||
| kuchosauronad0 | ||
| losinggeneration | ||
| manna-harbour_miryoku | ||
| mattly | ||
| mechmerlin | ||
| mguterl | ||
| miles2go | ||
| mnil | ||
| mtdjr | ||
| mverteuil | ||
| narze | ||
| nchristus | ||
| ninjonas | ||
| noroadsleft | ||
| not-quite-neo | ||
| nstickney | ||
| pcoves | ||
| peej | ||
| pvinis | ||
| replicaJunction | ||
| riblee | ||
| ridingqwerty | ||
| rishka | ||
| rmw | ||
| romus | ||
| rossman360 | ||
| rs | ||
| rupa | ||
| rverst | ||
| scheiklp | ||
| sethBarberee | ||
| sigma | ||
| sigul | ||
| snowe | ||
| spacebarracecar | ||
| spidey3 | ||
| spotpuff | ||
| stanrc85 | ||
| talljoe | ||
| tominabox1 | ||
| turbomech | ||
| twschum | ||
| vosechu | ||
| wanleg | ||
| xtonhasvim | ||
| xulkal | ||
| yanfali | ||
| yet-another-developer | ||
| zer09 | ||
| readme.md | ||
| yanfali_wkl | ||
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.