Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration

Browse Source

Conflicts:
	keyboards/infinity60/led_controller.c
	keyboards/infinity60/led_controller.h

...

This commit is contained in:

jpetermans 2017-05-08 15:42:27 -07:00

parent 967cf0f6d4 f1d81d2cc6

commit b5675e2025

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available