]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master' into debounce_refactor
authorAlex Ong <the.onga@gmail.com>
Fri, 4 Jan 2019 08:43:45 +0000 (19:43 +1100)
committerAlex Ong <the.onga@gmail.com>
Fri, 4 Jan 2019 08:43:45 +0000 (19:43 +1100)
commit2bb2977c133646c4e056960e72029270d77cc1eb
tree235d491f992121ac1716c5bf2fafb80983748576
parenta55c838961c89097ab849ed6cb1f261791e6b9b4
parent47c91fc7f75ae0a477e55b687aa0fc30da0a283c
Merge branch 'master' into debounce_refactor

# Conflicts:
# tmk_core/common/keyboard.c
quantum/matrix.c
tmk_core/common.mk
tmk_core/common/keyboard.c