summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-137-7/+523
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET.cbbrowne2016-10-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With RESET shifted to the UPPER+LOWER layer, it is now time to change that key to Alt-Slash, which, in Emacs, does automatic word completion
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-10-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-1013-26/+433
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-10-106864-2402769/+107777
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-069-1515/+1177
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | Annotates nordicErez Zukerman2016-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Tweaks Kristian's layout againErez Zukerman2016-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Kristian's keymapErez Zukerman2016-12-021-0/+79
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Better layoutErez Zukerman2016-11-301-50/+71
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #919 from jackhumbert/hf/robot_test_layoutJack Humbert2016-11-294-0/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robot
| * | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robotErez Zukerman2016-11-294-0/+143
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman2016-11-2965-204/+1761
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
| * | | | | | | | | | | | | | | | | | | guess i didnt pullJack Humbert2016-11-291-11/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-294-14/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Tweaks position of TOG not to conflict with MOErez Zukerman2016-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Tweaks EZ MakefileErez Zukerman2016-11-281-1/+6
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Pulls LED config into common config for EZErez Zukerman2016-11-282-10/+11
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | enable rgblight by default for ezJack Humbert2016-11-292-0/+12
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | enable api sysex for ezJack Humbert2016-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-2822-56/+1415
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | separated into api files/folderJack Humbert2016-11-2615-283/+303
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | rgblight fixesJack Humbert2016-11-233-6/+8
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | travis plsJack Humbert2016-11-236-52/+56
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | converted to new formatJack Humbert2016-11-234-115/+206
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | converted to 8bit messagesJack Humbert2016-11-233-53/+70
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-2122-32/+1226
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fix infinityJack Humbert2016-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | cleaning up mididJack Humbert2016-11-213-51/+59
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | cleaning up new codeJack Humbert2016-11-214-64/+73
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | merging lets_splitJack Humbert2016-11-2154-445/+2361
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | |