]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware...
authorjpetermans <tibcmhhm@gmail.com>
Mon, 8 May 2017 22:42:27 +0000 (15:42 -0700)
committerjpetermans <tibcmhhm@gmail.com>
Mon, 8 May 2017 22:42:27 +0000 (15:42 -0700)
commitb5675e20255a9306097ad58dabc8727a2c190946
tree34ff786a7e5177c6edc48e93b69ce71132cb3cbf
parent967cf0f6d43bd05c9951c7c31190971acd0799ea
parentf1d81d2cc6f257925d8582da630aadf5170bd878
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