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)
commit8c80deb775ac151001dc1592a2e94e8677b49964
treeaa62c5cbef8419d9cdded26440cfdb42f7d806fd
parent4701b08b71b187cb3d015bec7e05d30e35c344ac
parent39d093339393e1758eede06f736b1f99a68ac74c
Merge branch 'keymap2'

Conflicts:
common/keyboard.c
common/command.c
common/host.h
Imprint / Impressum