summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0511-193/+5851
|\
| * Merge pull request #932 from climbalima/masterJack Humbert2016-12-0411-193/+5851
| |\
| | * having trouble with conflictsclimbalima2016-12-033-20/+0
| | * cleaned up personal projectsclimbalima2016-12-0321-7375/+0
| | * Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-12-033-22/+35
| | |\
| | * | added plate files for lets splitclimbalima2016-12-0321-0/+7375
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-032-1/+5834
| | |\ \
| | * | | just savingclimbalima2016-11-1810-232/+54
* | | | | Trackpoint initializationPriyadi Iman Nurcahyo2016-12-052-1/+110
* | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0468-231/+1017
|\| | | |
| * | | | Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-0213-9/+47
| |\ \ \ \
| | * | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-0213-9/+47
| * | | | | adds warnings to 4 keymapsJack Humbert2016-12-024-4/+12
| |/ / / /
| * | | | Merge pull request #924 from cbbrowne/masterJack Humbert2016-12-023-7/+13
| |\ \ \ \
| | * | | | I also want page-down/page-up on UPPER layercbbrowne2016-12-021-1/+1
| | * | | | I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-021-1/+2
| | * | | | Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| | * | | | 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-2948-211/+845
| | |\ \ \ \ \
| | * \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 22:39:36 +0000