]> git.donarmstrong.com Git - qmk_firmware.git/commit
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)
commite6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4
treeef5775c79867a9e33f4233faf5139439ef23f014
parent2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7
parentf54b4771eb23027be1bd66a6fe1300713b593d58
Merge branch 'user_led_configuration' into infinity60

Conflicts:
keyboards/infinity60/keymaps/jpetermans/keymap.c