Commit Graph

791 Commits (0f71c81df833a282250ecc4e66034320e40b208e)

Author SHA1 Message Date
climbalima 0f71c81df8 having trouble with conflicts
8 years ago
climbalima 45b7718fb1 cleaned up personal projects
8 years ago
climbalima 59c54d651b Merge https://github.com/climbalima/qmk_firmware
8 years ago
climbalima ae66f0d702 added plate files for lets split
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 668c739702 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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
Seebs 4da698fda3 dvorak/plover keyboard layout
8 years ago
Jack Humbert 9f1b27c5ba Merge pull request #880 from psyill/master
8 years ago
Jack Humbert e025a94bc2 Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
8 years ago
Jack Humbert d85f6deb9b Merge pull request #877 from sethbc/update_sethbc_satan_keymap
8 years ago
Jack Humbert 6dde65c2a9 Merge pull request #876 from Dbroqua/master
8 years ago
Jack Humbert 17e1a4f825 Merge pull request #866 from fredizzimo/infinity60_clockfixes
8 years ago
climbalima bce6e52391 fixed conflict
8 years ago
climbalima dd22c787b8 fixed extra paste
8 years ago
Hans Ellegård 162f603b1c Added keymap "videck", an ErgoDox keymap for Vi(m) users.
8 years ago
Seth Chandler aa76425395 oops, fixed inverted if statement
8 years ago
Seth Chandler 34bf8558cd update sethbc ergodox keymap
8 years ago
Seth Chandler 28249498bc update sethbc keymap
8 years ago
Damien 0a99cf300c Merge pull request #12 from jackhumbert/master
8 years ago
dbroqua 3bc51065a4 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
8 years ago
dbroqua 19ebf6161f - Added dbroqua_hhkb layout for Satan PCB
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 1803dbc6d5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
8 years ago
Jonathan Arnett 1d766c596e
Removed the control action when holding z or /
8 years ago
Fred Sundvik c06e2486ab Increase the infinity60 system tick frequency
8 years ago
Damien 7697f23538 Merge pull request #11 from jackhumbert/master
8 years ago
IBNobody 9e6c57af2a Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
8 years ago
Erez Zukerman d5270af111 Implements dedicated text zoom keys
8 years ago
Erez Zukerman 7a9be2562d Merge pull request #851 from J3RN/momentary
8 years ago
Erez Zukerman a6401076d5 Merge pull request #843 from lucwastiaux/master
8 years ago
Erez Zukerman bd40844e4e Merge pull request #836 from 20lives/master
8 years ago
Jack Humbert 964b8574ee Merge pull request #839 from priyadi/planck-priyadi-modification
8 years ago
IBNobody 508eddf8ba Fixing Debounce - WIP
8 years ago
IBNobody a0fdb6b81a Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
8 years ago
dbroqua 2082c6f110 - Fixed typo in gh60/dbroqua layout
8 years ago
lucwastiaux 055247f35d re-introduce brackets layer
8 years ago
Jack Humbert f44ead1462 Merge pull request #827 from Dbroqua/master
8 years ago
Jack Humbert 67cf367a45 Merge pull request #849 from hot-leaf-juice/master
8 years ago
Jack Humbert cbb7e95284 Merge pull request #847 from yinshanyang/master
8 years ago
Jack Humbert 3b34cf7e6c Merge pull request #841 from jacwib/master
8 years ago