summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-11-25Added protocol.mk to buildofples1-0/+1
2016-11-25Merge pull request #899 from Wilba6582/suspend_fixJack Humbert1-5/+6
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba65821-6/+1
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba65821-1/+7
2016-11-23Merge pull request #898 from PureSpider/backlight-fixJack Humbert1-2/+2
2016-11-23Merge pull request #896 from h-youhei/jp106Jack Humbert1-0/+62
2016-11-22Set backlight status to on if it's at maximum brightness already and the brig...PureSpider1-2/+2
2016-11-22Add japanese keymaph-youhei1-0/+62
2016-11-22Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2-0/+235
2016-11-22Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert3-0/+147
2016-11-22Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert2-26/+5
2016-11-22Merge pull request #891 from g-sam/galson-keymapJack Humbert3-0/+196
2016-11-22Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert1-2/+9
2016-11-22Merge pull request #888 from climbalima/masterJack Humbert3-4/+12
2016-11-22Merge pull request #887 from profet23/atreus62Jack Humbert8-0/+622
2016-11-20add del to new cmdSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang1-1/+1
2016-11-20add space to NewCmd layerSihui Huang2-2/+2
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-19don't always detect a matrix change (fixes debounce)Jack Humbert1-1/+1
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-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