diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:42:27 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:42:27 -0700 |
| commit | b5675e20255a9306097ad58dabc8727a2c190946 (patch) | |
| tree | 34ff786a7e5177c6edc48e93b69ce71132cb3cbf /readme.md | |
| parent | 967cf0f6d43bd05c9951c7c31190971acd0799ea (diff) | |
| parent | f1d81d2cc6f257925d8582da630aadf5170bd878 (diff) | |
| download | firmware-b5675e20255a9306097ad58dabc8727a2c190946.tar.gz firmware-b5675e20255a9306097ad58dabc8727a2c190946.tar.bz2 firmware-b5675e20255a9306097ad58dabc8727a2c190946.zip | |
Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration
Conflicts:
keyboards/infinity60/led_controller.c
keyboards/infinity60/led_controller.h
Diffstat (limited to 'readme.md')
0 files changed, 0 insertions, 0 deletions