Commit Graph

15 Commits (21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60)

Author SHA1 Message Date
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 bce6e52391 fixed conflict
8 years ago
climbalima dd22c787b8 fixed extra paste
8 years ago
climbalima ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware
8 years ago
climbalima b5cecb4cc9 Added both revisions into one folder
8 years ago
climbalima 79f82d3d80 returned to o
8 years ago
climbalima 6e27f6fbde Changes to be committed:
8 years ago
IBNobody 6631abc1cb Made Serial and I2C not include the Other
8 years ago
Jack Humbert 8b94e26d7c Fixes midi functionality
8 years ago
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio
8 years ago
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile
8 years ago
Jack Humbert dd2522ba8b add options to config.h
8 years ago
Jack Humbert d707738616 i2c working
8 years ago