Commit Graph

9 Commits (b5159c964a6cd2997bf49951e0e99ed4d3d38f1e)

Author SHA1 Message Date
climbalima 0f71c81df8 having trouble with conflicts
8 years ago
climbalima 59c54d651b Merge https://github.com/climbalima/qmk_firmware
8 years ago
climbalima 2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
climbalima 102a830bbd changed readme
8 years ago
climbalima 01736a502e just saving
8 years ago
climbalima b085a34506 fixed readme conflicts
8 years ago
climbalima 5cac51a773 Merge https://github.com/climbalima/qmk_firmware
8 years ago
climbalima 1dd6ceb45d Updated my repo to current qmk
8 years ago
climbalima 6e27f6fbde Changes to be committed:
8 years ago