Commit Graph

3671 Commits (0f71c81df833a282250ecc4e66034320e40b208e)
 

Author SHA1 Message Date
climbalima 0f71c81df8 having trouble with conflicts
9 years ago
climbalima 45b7718fb1 cleaned up personal projects
9 years ago
climbalima 59c54d651b Merge https://github.com/climbalima/qmk_firmware
9 years ago
climbalima ae66f0d702 added plate files for lets split
9 years ago
climbalima 2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
9 years ago
climbalima 102a830bbd changed readme
9 years ago
climbalima e356de2220 added the pinout for pro micro into maxipad
9 years ago
climbalima 01736a502e just saving
9 years ago
Jack Humbert a06115df19 don't always detect a matrix change (fixes debounce)
9 years ago
Jack Humbert c38b3e3be9 Merge pull request #883 from climbalima/master
9 years ago
climbalima b085a34506 fixed readme conflicts
9 years ago
climbalima 21b6b4e6c4 should have fixed conflixed
9 years ago
climbalima 668c739702 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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
Jack Humbert 72e78a017f Merge pull request #882 from seebs/master
9 years ago
Seebs 4da698fda3 dvorak/plover keyboard layout
9 years ago
Jack Humbert 9f1b27c5ba Merge pull request #880 from psyill/master
9 years ago
Jack Humbert e025a94bc2 Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
9 years ago
Jack Humbert d85f6deb9b Merge pull request #877 from sethbc/update_sethbc_satan_keymap
9 years ago
Jack Humbert 6dde65c2a9 Merge pull request #876 from Dbroqua/master
9 years ago
Jack Humbert 17e1a4f825 Merge pull request #866 from fredizzimo/infinity60_clockfixes
9 years ago
Jack Humbert 7541122cad Merge pull request #860 from IBNobody/master
9 years ago
climbalima bce6e52391 fixed conflict
9 years ago
climbalima dd22c787b8 fixed extra paste
9 years ago
Hans Ellegård 162f603b1c Added keymap "videck", an ErgoDox keymap for Vi(m) users.
9 years ago
Seth Chandler aa76425395 oops, fixed inverted if statement
9 years ago
Seth Chandler 34bf8558cd update sethbc ergodox keymap
9 years ago
Seth Chandler 28249498bc update sethbc keymap
9 years ago
Damien 0a99cf300c Merge pull request #12 from jackhumbert/master
9 years ago
dbroqua 3bc51065a4 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
9 years ago
dbroqua 19ebf6161f - Added dbroqua_hhkb layout for Satan PCB
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
Jack Humbert 631b8999a7 Merge pull request #868 from potz/master
9 years ago
climbalima 79f82d3d80 returned to o
9 years ago
climbalima 6e27f6fbde Changes to be committed:
9 years ago
Erez Zukerman f73a378f0f Merge pull request #870 from NoahAndrews/patch-1
9 years ago
IBNobody 1803dbc6d5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
9 years ago
Noah Andrews 64218f0f70 Add proper shortcode for KC_DELETE to keycode.txt
9 years ago
Potiguar Faga 7aa31ad338 Add brazilian ABNT2 keymap
9 years ago
Jack Humbert a9e0fd410c Merge pull request #867 from fredizzimo/variable_trace
9 years ago
Jack Humbert 309d93184e Merge pull request #852 from J3RN/remove-z-slash-controls
9 years ago
Fred Sundvik 0ba3e523a7 Add documentation for the variable tracing
9 years ago
Fred Sundvik a377017c95 Add possibility to control variable trace from make
10 years ago
Fred Sundvik f519b94be7 Add variable trace
10 years ago
Jonathan Arnett 1d766c596e
Removed the control action when holding z or /
10 years ago
Fred Sundvik c06e2486ab Increase the infinity60 system tick frequency
10 years ago
Damien 7697f23538 Merge pull request #11 from jackhumbert/master
10 years ago
IBNobody 78976d8f7a Adding SKIP_GIT to speed up compiles.
10 years ago