summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2814-0/+1182
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2350-223/+2365
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-1618-123/+945
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-071-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-0113-480/+1133
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-312-58/+98
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2613-37/+484
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-2333-127/+1549
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-164-72/+445
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-135-6/+517
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET.cbbrowne2016-10-121-2/+3
| | | * | | | | | | | | | | | | | | | | | | | 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
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robotErez Zukerman2016-11-292-0/+135
| | | * | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman2016-11-2942-69/+502
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | 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-2814-0/+1182
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | / / / / / / / | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | separated into api files/folderJack Humbert2016-11-265-25/+4
| | | | * | | | | | | | | | | | | | | | | | rgblight fixesJack Humbert2016-11-232-5/+7
| | | | * | | | | | | | | | | | | | | | | | travis plsJack Humbert2016-11-232-2/+4
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-2121-30/+1217
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | fix infinityJack Humbert2016-11-212-2/+2
| | | | * | | | | | | | | | | | | | | | | | merging lets_splitJack Humbert2016-11-2150-319/+2097
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | working with helper, qmk_helper_windows@05b0105Jack Humbert2016-11-212-6/+6
| | | | * | | | | | | | | | | | | | | | | | | wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-183-7/+42
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | Groundwork for dedicated color keycodesErez Zukerman2016-11-171-1/+23
| | | | | * | | | | | | | | | | | | | | | | | | Initial Erez Experimental keymap tweaksErez Zukerman2016-11-173-6/+19
| | | | * | | | | | | | | | | | | | | | | | | | midi back and forthJack Humbert2016-11-181-1/+6
| | | | |/ / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | rgb light through midiJack Humbert2016-11-1721-21/+22
| | | | * | | | | | | | | | | | | | | | | | | mostly workingJack Humbert2016-11-134-4/+13
| | | | * | | | | | | | | | | | | | | | | | | mergingJack Humbert2016-11-1286-263/+4826
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | working with power limitJack Humbert2016-10-164-0/+365
| | |