]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 967cf0f f1d81d2)
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)
Conflicts:
keyboards/infinity60/led_controller.c
keyboards/infinity60/led_controller.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.