Commit Graph

5 Commits (df8724ce08e09b6b077b601da7976639140655d7)

Author SHA1 Message Date
climbalima b085a34506 fixed readme conflicts
8 years ago
climbalima 21b6b4e6c4 should have fixed conflixed
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