]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge branch 'keymap2'
authortmk <nobody@nowhere>
Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
committertmk <nobody@nowhere>
Mon, 11 Feb 2013 03:48:49 +0000 (12:48 +0900)
Conflicts:
common/keyboard.c

1  2 
common/command.c
common/host.h

Simple merge
diff --cc common/host.h
Simple merge