Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik...
authortmk <hasu@tmk-kbd.com>
Mon, 19 Jan 2015 02:17:05 +0000 (11:17 +0900)
committertmk <hasu@tmk-kbd.com>
Mon, 19 Jan 2015 02:17:05 +0000 (11:17 +0900)
commita5122d5aba323514b2a466e0f0491b128b9f8823
tree80d17bca8a8cab41a838532ff0007e4b33c113be
parent703ca9de213955443f8713901cc96d482633931f
parenta6d33e2c98b16fdd3c7eaccb9e8c941d4315d528
Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid

Conflicts:
README.md
README.md
Imprint / Impressum