summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-22Merge pull request #896 from h-youhei/jp106Jack Humbert
2016-11-22Add japanese keymaph-youhei
2016-11-21Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert
2016-11-21Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert
2016-11-21Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert
2016-11-21Merge pull request #891 from g-sam/galson-keymapJack Humbert
2016-11-21Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert
2016-11-21Merge pull request #888 from climbalima/masterJack Humbert
2016-11-21Merge pull request #887 from profet23/atreus62Jack Humbert
2016-11-20add del to new cmdSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20typo fixDidier Chagniot
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20add sh-hhkb-jp layersSihui Huang
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik
2016-11-19Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert
2016-11-19remove KC expansion from GH60Seth Chandler
2016-11-19Fix the Space Cadet timeout codeGergely Nagy
2016-11-19move KC expansion to separate macrosSeth Chandler
2016-11-19merge upstream/masterSeth Chandler
2016-11-19adds galson keymapsamgalson@gmail.com
2016-11-19Add a timeout to space-cadet shift.Gergely Nagy
2016-11-19changed readmeclimbalima
2016-11-19added the pinout for pro micro into maxipadclimbalima
2016-11-18don't always detect a matrix change (fixes debounce)Jack Humbert
2016-11-16Adding readme placeholderBenjamin Grabkowitz
2016-11-16Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz
2016-11-16Merge pull request #883 from climbalima/masterJack Humbert
2016-11-16fixed readme conflictsclimbalima
2016-11-16should have fixed conflixedclimbalima
2016-11-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima
2016-11-16Merge https://github.com/climbalima/qmk_firmwareclimbalima
2016-11-16Updated my repo to current qmkclimbalima
2016-11-16Merge pull request #882 from seebs/masterJack Humbert
2016-11-16dvorak/plover keyboard layoutSeebs
2016-11-16Merge pull request #880 from psyill/masterJack Humbert
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert
2016-11-16Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert
2016-11-16Merge pull request #860 from IBNobody/masterJack Humbert
2016-11-14fixed conflictclimbalima
2016-11-14fixed extra pasteclimbalima
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans Ellegård
2016-11-13oops, fixed inverted if statementSeth Chandler
2016-11-13update sethbc ergodox keymapSeth Chandler
2016-11-13add sethbc keymap for gh60 and update macro expansion in connection with sameSeth Chandler