Commit Graph

12 Commits (bce6e52391da7c5f620c96a91857940f0dee19df)

Author SHA1 Message Date
climbalima bce6e52391 fixed conflict
9 years ago
climbalima dd22c787b8 fixed extra paste
9 years ago
climbalima ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware
9 years ago
climbalima b5cecb4cc9 Added both revisions into one folder
9 years ago
climbalima 79f82d3d80 returned to o
9 years ago
climbalima 6e27f6fbde Changes to be committed:
9 years ago
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile
10 years ago
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h
10 years ago
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool
10 years ago
Jack Humbert dd2522ba8b add options to config.h
10 years ago
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci]
10 years ago
Jack Humbert d707738616 i2c working
10 years ago