summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* actually resolves conflicts in rgblight.cJack Humbert2016-04-261-5/+0
* resolves conflicts in rgblight.cJack Humbert2016-04-2625-6/+1891
|\
| * updates README, fixes typo in new_project.shJack Humbert2016-04-262-3/+5
| * Fixup rgb underlight for clueboard1skullY2016-04-133-10/+9
| * Fixup RGBLIGHT support for clueboard2skullY2016-04-102-9/+8
| * Add a help message to new_project.shskullY2016-04-071-0/+5
| * Fixup the cluepad codeskullY2016-04-054-13/+13
| * Fix the clueboard2 led codeskullY2016-04-051-1/+1
| * Fixup clueboard support and add rgb to clueboard1skullY2016-03-289-43/+137
| * Adding clueboard/cluepad support to qmkskullY2016-03-2722-2/+1783
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-04-263-0/+390
|\ \
| * | adds freq LUT for future useJack Humbert2016-04-261-0/+357
| * | adds delayed vibratoJack Humbert2016-04-262-0/+33
* | | Honing in on an interval that works for meErez Zukerman2016-04-262-1081/+1081
|/ /
* | [Erez & Jack] Examples for advanced macro stuffErez Zukerman2016-04-263-1070/+1230
* | Merge pull request #282 from jasontwong/masterErez Zukerman2016-04-254-0/+1399
|\ \
| * | Compiled Hex FileJason T. Wong2016-04-241-0/+1159
| * | Update keymap imageJason T. Wong2016-04-231-0/+0
| * | Add new keymapJason T. Wong2016-04-233-0/+240
* | | adds revisions of .hex files for planck/preonicJack Humbert2016-04-256-0/+10413
* | | removes old .hex filesJack Humbert2016-04-255-7944/+0
* | | updates default voice, prunes voicesJack Humbert2016-04-252-29/+29
* | | addresses memory limits concerns for atomic default makefileJack Humbert2016-04-251-1/+1
* | | updates preonic default keymapJack Humbert2016-04-251-16/+16
* | | updates planck default keymapJack Humbert2016-04-251-19/+18
* | | updating personal atomic keymap (#285)IBNobody2016-04-241-86/+97
* | | Merge pull request #280 from Twey/masterErez Zukerman2016-04-244-0/+1398
|\ \ \
| * | | Add Twey's keymapJames ‘Twey’ Kay2016-04-253-0/+1366
| * | | Add a keymap_extras header for PloverJames ‘Twey’ Kay2016-04-231-0/+32
| |/ /
* / / adds voice iteration to planck defaultJack Humbert2016-04-231-4/+24
|/ /
* | Fix typo (#276)Eric Tang2016-04-221-3/+3
* | adds more voice harmonicsJack Humbert2016-04-222-3/+18
* | Merge remote-tracking branch 'origin/master'Jack Humbert2016-04-225-39/+85
|\ \
| * | fixed compiler warnings (#273)IBNobody2016-04-225-37/+83
* | | adds fifth and fourth down voicesJack Humbert2016-04-222-0/+17
|/ /
* | adds more voices, fixes macro redefinesJack Humbert2016-04-212-4/+9
* | Merge pull request #271 from eltang/qmk_firmware/eeprom_wear_fixJack Humbert2016-04-2114-52/+52
|\ \
| * | Update functions used to write to EEPROMEric Tang2016-04-2114-52/+52
|/ /
* | adds multiple voices and the ability to iterate/deiterate between themJack Humbert2016-04-213-5/+53
* | Merge pull request #265 from sboesebeck/masterErez Zukerman2016-04-2110-2936/+3246
|\ \
| * | changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,...Stephan Bösebeck2016-04-201-24/+24
| * | added some words about the ELG in the readmeStephan Bösebeck2016-04-201-0/+13
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-2013-1575/+1527
| |\ \
| * | | re-created all layouts using ErgodoxLayoutGeneratorStephan Bösebeck2016-04-195-2546/+2544
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1918-440/+970
| |\ \ \
| * | | | new overview picStephan Bösebeck2016-04-191-0/+0
| * | | | added new macro for toggling and holiding layerStephan Bösebeck2016-04-191-16/+48
| * | | | new experimental layoutStephan Bösebeck2016-04-192-33/+31
| * | | | added smly layer againStephan Bösebeck2016-04-181-2/+2
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1815-266/+362
| |\ \ \ \