aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Improve docs on memory usagecbbrowne2016-12-011-0/+7
| * | | | | | | | Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| * | | | | | | | More notes on .hex size protectioncbbrowne2016-12-011-3/+16
| * | | | | | | | Make my builds smallercbbrowne2016-12-012-3/+7
| * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-12-011-50/+71
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2971-346/+2112
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2818-82/+1340
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-254-8/+47
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-2354-228/+2439
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-1622-249/+1209
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-102-1/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-112-1/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-11-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-11-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-11-0635-599/+1870
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-075-3/+178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-0114-481/+1135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-314-67/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2618-51/+613
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2010-0/+676
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1823-127/+873
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-10-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1711-72/+497
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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-1611-72/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | 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-106858-2402144/+107152
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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 robotErez Zukerman2016-11-294-0/+143
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7Erez Zukerman2016-11-2965-204/+1761
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | 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