summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-04-26actually resolves conflicts in rgblight.cJack Humbert1-5/+0
2016-04-26resolves conflicts in rgblight.cJack Humbert25-6/+1891
2016-04-26updates README, fixes typo in new_project.shJack Humbert2-3/+5
2016-04-26Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman3-0/+390
2016-04-26Honing in on an interval that works for meErez Zukerman2-1081/+1081
2016-04-26Add Roman's layout with QWERTYRoman Zolotarev4-0/+1246
2016-04-26Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareRoman Zolotarev110-9261/+18629
2016-04-26adds freq LUT for future useJack Humbert1-0/+357
2016-04-26adds delayed vibratoJack Humbert2-0/+33
2016-04-26[Erez & Jack] Examples for advanced macro stuffErez Zukerman3-1070/+1230
2016-04-25Merge pull request #282 from jasontwong/masterErez Zukerman4-0/+1399
2016-04-25adds revisions of .hex files for planck/preonicJack Humbert6-0/+10413
2016-04-25removes old .hex filesJack Humbert5-7944/+0
2016-04-25updates default voice, prunes voicesJack Humbert2-29/+29
2016-04-25addresses memory limits concerns for atomic default makefileJack Humbert1-1/+1
2016-04-25updates preonic default keymapJack Humbert1-16/+16
2016-04-25updates planck default keymapJack Humbert1-19/+18
2016-04-25Compiled Hex FileJason T. Wong1-0/+1159
2016-04-25updating personal atomic keymap (#285)IBNobody1-86/+97
2016-04-25Merge pull request #280 from Twey/masterErez Zukerman4-0/+1398
2016-04-25Add Twey's keymapJames ‘Twey’ Kay3-0/+1366
2016-04-24Update keymap imageJason T. Wong1-0/+0
2016-04-24adds voice iteration to planck defaultJack Humbert1-4/+24
2016-04-24Add new keymapJason T. Wong3-0/+240
2016-04-23Add a keymap_extras header for PloverJames ‘Twey’ Kay1-0/+32
2016-04-22Fix typo (#276)Eric Tang1-3/+3
2016-04-22adds more voice harmonicsJack Humbert2-3/+18
2016-04-22Merge remote-tracking branch 'origin/master'Jack Humbert5-39/+85
2016-04-22adds fifth and fourth down voicesJack Humbert2-0/+17
2016-04-22fixed compiler warnings (#273)IBNobody5-37/+83
2016-04-22adds more voices, fixes macro redefinesJack Humbert2-4/+9
2016-04-22Merge pull request #271 from eltang/qmk_firmware/eeprom_wear_fixJack Humbert14-52/+52
2016-04-22Update functions used to write to EEPROMEric Tang14-52/+52
2016-04-22adds multiple voices and the ability to iterate/deiterate between themJack Humbert3-5/+53
2016-04-21Merge pull request #265 from sboesebeck/masterErez Zukerman10-2936/+3246
2016-04-21converts tabs to spacesJack Humbert2-47/+47
2016-04-21restructures audio, begins voicingJack Humbert9-23/+91
2016-04-21fade envelopeJack Humbert1-9/+12
2016-04-21start of envelope functionJack Humbert1-0/+28
2016-04-21sounds for plover layoutJack Humbert2-27/+28
2016-04-21start-up sound working, removes tick with some devicesJack Humbert2-2/+3
2016-04-21there is no onJack Humbert1-1/+1
2016-04-21delay isn't the problem hereJack Humbert2-2/+1
2016-04-21makes the plover keymap correctJack Humbert1-1/+1
2016-04-20changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,...Stephan Bösebeck1-24/+24
2016-04-20added some words about the ELG in the readmeStephan Bösebeck1-0/+13
2016-04-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck13-1575/+1527
2016-04-20Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert7-1326/+1337
2016-04-20fixed startup audio with a 500ms delayJack Humbert6-181/+104
2016-04-20Merge pull request #267 from nrrkeene/masterErez Zukerman7-1326/+1337