Commit Graph

5 Commits (27ebacb15d39046713bd87e06c1157b1ffab6aaf)

Author SHA1 Message Date
climbalima b085a34506 fixed readme conflicts
9 years ago
climbalima 21b6b4e6c4 should have fixed conflixed
9 years ago
climbalima 5cac51a773 Merge https://github.com/climbalima/qmk_firmware
9 years ago
climbalima 1dd6ceb45d Updated my repo to current qmk
9 years ago
climbalima 6e27f6fbde Changes to be committed:
9 years ago