From: tmk <nobody@nowhere>
Date: Mon, 11 Feb 2013 03:48:49 +0000 (+0900)
Subject: Merge branch 'keymap2'
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=8c80deb775ac151001dc1592a2e94e8677b49964;p=max%2Ftmk_keyboard.git

Merge branch 'keymap2'

Conflicts:
	common/keyboard.c
---

8c80deb775ac151001dc1592a2e94e8677b49964