git.friedersdorff.com Git - max/tmk_keyboard.git/commit

]> git.friedersdorff.com Git - max/tmk_keyboard.git/commit

projects / max / tmk_keyboard.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 703ca9d a6d33e2)

author	tmk <hasu@tmk-kbd.com>
	Mon, 19 Jan 2015 02:17:05 +0000 (11:17 +0900)
committer	tmk <hasu@tmk-kbd.com>
	Mon, 19 Jan 2015 02:17:05 +0000 (11:17 +0900)
commit	a5122d5aba323514b2a466e0f0491b128b9f8823
tree	80d17bca8a8cab41a838532ff0007e4b33c113be	tree \| snapshot
parent	703ca9de213955443f8713901cc96d482633931f	commit \| diff
parent	a6d33e2c98b16fdd3c7eaccb9e8c941d4315d528	commit \| diff

Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid

Conflicts:
README.md

Unnamed repository; edit this file 'description' to name the repository.