summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-11-20typo fixDidier Chagniot2-19/+19
2016-11-20Update README.mdSihui Huang1-1/+1
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20Update README.mdSihui Huang1-1/+2
2016-11-20add sh-hhkb-jp layersSihui Huang3-0/+145
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik2-26/+5
2016-11-19Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert5-68/+148
2016-11-19remove KC expansion from GH60Seth Chandler4-99/+55
2016-11-19Fix the Space Cadet timeout codeGergely Nagy1-0/+4
2016-11-19move KC expansion to separate macrosSeth Chandler4-23/+66
2016-11-19merge upstream/masterSeth Chandler49-378/+2213
2016-11-19adds galson keymapsamgalson@gmail.com3-0/+196
2016-11-19Add a timeout to space-cadet shift.Gergely Nagy1-2/+5
2016-11-19changed readmeclimbalima2-2/+3
2016-11-19added the pinout for pro micro into maxipadclimbalima2-3/+10
2016-11-19just savingclimbalima10-232/+54
2016-11-19don't always detect a matrix change (fixes debounce)Jack Humbert1-1/+1
2016-11-19wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert5-7/+50
2016-11-19midi back and forthJack Humbert3-18/+52
2016-11-18Groundwork for dedicated color keycodesErez Zukerman3-1/+31
2016-11-18Initial Erez Experimental keymap tweaksErez Zukerman3-6/+19
2016-11-17rgb light through midiJack Humbert26-31/+126
2016-11-17Adding readme placeholderBenjamin Grabkowitz1-0/+10
2016-11-17Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz7-0/+612
2016-11-17Merge pull request #883 from climbalima/masterJack Humbert25-129/+760
2016-11-17fixed readme conflictsclimbalima1-20/+2
2016-11-17should have fixed conflixedclimbalima13-268/+10
2016-11-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima24-249/+1453
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756
2016-11-16Merge pull request #882 from seebs/masterJack Humbert2-0/+244
2016-11-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne22-249/+1209
2016-11-16dvorak/plover keyboard layoutSeebs2-0/+244
2016-11-16Merge pull request #880 from psyill/masterJack Humbert6-0/+678
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert3-13/+3
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert1-7/+7
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert3-1/+120
2016-11-16Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2-2/+7
2016-11-16Merge pull request #860 from IBNobody/masterJack Humbert7-226/+394
2016-11-15animations, midi, etcJack Humbert2-3/+3
2016-11-15fixed conflictclimbalima1-3/+0
2016-11-15fixed extra pasteclimbalima1-3/+2
2016-11-14Recommend WSL on Windows 10Noah Andrews1-9/+9
2016-11-14mostly workingJack Humbert10-72/+125
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd6-0/+678
2016-11-13oops, fixed inverted if statementSeth Chandler1-6/+6
2016-11-13update sethbc ergodox keymapSeth Chandler3-13/+3
2016-11-13add sethbc keymap for gh60 and update macro expansion in connection with sameSeth Chandler3-15/+96
2016-11-13update sethbc keymapSeth Chandler1-1/+1
2016-11-13mergingJack Humbert104-313/+5332