]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dcd6c3 f54b477)
Merge branch 'user_led_configuration' into infinity60
authorjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 19:07:18 +0000 (12:07 -0700)
committerjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 19:07:18 +0000 (12:07 -0700)
Conflicts:
keyboards/infinity60/keymaps/jpetermans/keymap.c


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