]> git.friedersdorff.com Git - max/tmk_keyboard.git/commit - keyboard/infinity/mbed-infinity/USBHAL_KL25Z.cpp
Merge remote-tracking branch 'tmk/master'
authorOleg Kostyuk <cub.uanic@gmail.com>
Tue, 10 Feb 2015 00:22:26 +0000 (02:22 +0200)
committerOleg Kostyuk <cub.uanic@gmail.com>
Tue, 10 Feb 2015 00:22:26 +0000 (02:22 +0200)
commita620448e7bfb1a5ec75b69c0dadb81444aa51c2e
tree616772b3515660dbf4f409115b53f5f7b7b4d150
parentc375334bf53584e6e8f0945feabb57cb24b77bfa
parentabf482de8e62880f27c377c2bdbcb664fda0df0b
Merge remote-tracking branch 'tmk/master'

Conflicts:
README.md
README.md