aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjpetermans <tibcmhhm@gmail.com>2017-05-24 12:07:18 -0700
committerjpetermans <tibcmhhm@gmail.com>2017-05-24 12:07:18 -0700
commite6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4 (patch)
treeef5775c79867a9e33f4233faf5139439ef23f014 /lib
parent2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (diff)
parentf54b4771eb23027be1bd66a6fe1300713b593d58 (diff)
downloadfirmware-e6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4.tar.gz
firmware-e6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4.tar.bz2
firmware-e6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4.zip
Merge branch 'user_led_configuration' into infinity60
Conflicts: keyboards/infinity60/keymaps/jpetermans/keymap.c
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions