Commit Graph

12 Commits (f94963e6b7e285a3e9ce6a807da77fad508791a4)

Author SHA1 Message Date
Jack Humbert b476d65b9c Update keyboards' rules.mk/Makefiles (#1442)
7 years ago
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 e356de2220 added the pinout for pro micro into maxipad
8 years ago
climbalima 01736a502e just saving
8 years ago
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