Commit Graph

7 Commits (2186e5ae85aa4cda798b36fd7883d893944ae8a3)

Author SHA1 Message Date
climbalima 2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
9 years ago
climbalima 01736a502e just saving
9 years ago
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