]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
projects / max / tmk_keyboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5886709 7694eb6)
Merge branch 'master' into chibios
authorflabbergast <s3+flabbergast@sdfeu.org>
Fri, 15 Jan 2016 17:11:46 +0000 (17:11 +0000)
committerflabbergast <s3+flabbergast@sdfeu.org>
Fri, 15 Jan 2016 17:11:46 +0000 (17:11 +0000)
1  2 
tmk_core/common/keymap.c patch | diff1 | diff2 | blob | history

diff --cc tmk_core/common/keymap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.