summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2016-11-212-26/+5
| |\ \ \ \ \
| | * | | | | Always initialze the Infinity Ergodox backlightFred Sundvik2016-11-202-26/+5
| | |/ / / /
| * | | | | Merge pull request #891 from g-sam/galson-keymapJack Humbert2016-11-213-0/+196
| |\ \ \ \ \
| | * | | | | adds galson keymapsamgalson@gmail.com2016-11-193-0/+196
| * | | | | | Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert2016-11-211-2/+9
| |\ \ \ \ \ \
| | * | | | | | Fix the Space Cadet timeout codeGergely Nagy2016-11-191-0/+4
| | * | | | | | Add a timeout to space-cadet shift.Gergely Nagy2016-11-191-2/+5
| | |/ / / / /
| * | | | | | Merge pull request #888 from climbalima/masterJack Humbert2016-11-213-4/+12
| |\ \ \ \ \ \
| | * | | | | | changed readmeclimbalima2016-11-192-2/+3
| | * | | | | | added the pinout for pro micro into maxipadclimbalima2016-11-192-3/+10
| * | | | | | | Merge pull request #887 from profet23/atreus62Jack Humbert2016-11-218-0/+622
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Adding readme placeholderBenjamin Grabkowitz2016-11-161-0/+10
| | * | | | | | Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz2016-11-167-0/+612
| * | | | | | | Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert2016-11-195-68/+148
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | remove KC expansion from GH60Seth Chandler2016-11-194-99/+55
| | * | | | | | move KC expansion to separate macrosSeth Chandler2016-11-194-23/+66
| | * | | | | | merge upstream/masterSeth Chandler2016-11-1949-378/+2213
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | don't always detect a matrix change (fixes debounce)Jack Humbert2016-11-181-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #883 from climbalima/masterJack Humbert2016-11-1625-129/+760
| |\ \ \ \ \ \
| | * | | | | | fixed readme conflictsclimbalima2016-11-161-20/+2
| | * | | | | | should have fixed conflixedclimbalima2016-11-1613-268/+10
| | * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-11-1624-249/+1453
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #882 from seebs/masterJack Humbert2016-11-162-0/+244
| |\ \ \ \ \ \ \
| | * | | | | | | dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
| |/ / / / / / /
| * | | | | | | Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
| |\ \ \ \ \ \ \
| | * | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-163-13/+3
| |\ \ \ \ \ \ \
| | * | | | | | | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| | |/ / / / / /
| * | | | | | | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
| |\ \ \ \ \ \ \
| | * | | | | | | oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| | * | | | | | | update sethbc keymapSeth Chandler2016-11-121-1/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-163-1/+120
| |\ \ \ \ \ \ \
| | * | | | | | | Merge pull request #12 from jackhumbert/masterDamien2016-11-127-4/+237
| | |\| | | | | |
| | * | | | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-1218-548/+1257
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge pull request #11 from jackhumbert/masterDamien2016-11-0318-548/+1257
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | * | / | | | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| | |/ / / / / / /
| | * | | | | | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-261-1/+1
| | * | | | | | | Merge pull request #10 from jackhumbert/masterDamien2016-10-2656-235/+2562
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2016-11-162-2/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Increase the infinity60 system tick frequencyFred Sundvik2016-11-052-2/+7
| * | | | | | | | | | Merge pull request #860 from IBNobody/masterJack Humbert2016-11-167-226/+394
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-085-3/+178
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Adding SKIP_GIT to speed up compiles.IBNobody2016-11-011-18/+39
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-0115-76/+785
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | added fixed debounce codeIBNobody2016-10-291-73/+70
| | * | | | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmwareIBNobody2016-10-29105-1181/+5745
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Made scanning more efficientIBNobody2016-10-291-31/+24
| | | * | | | | | | | | Refactoring Matrix scanningIBNobody2016-10-282-88/+95
| | | * | | | | | | | | Fixing Debounce - WIPIBNobody2016-10-283-84/+174
| | | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2818-51/+613
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |