summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #948 from climbalima/masterJack Humbert2016-12-1211-9/+438
|\
| * svg bug fix and added pilcrow to hand wireclimbalima2016-12-1211-9/+438
* | re-enable audio and extrakeysJack Humbert2016-12-122-4/+4
* | Merge pull request #946 from climbalima/masterJack Humbert2016-12-121-11/+19
|\|
| * changed svg after mergeclimbalima2016-12-101-470/+470
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-10108-356/+3734
| |\
| * | changed svg to support proto pcbclimbalima2016-12-101-474/+482
* | | Merge pull request #945 from priyadi/planck_priyadiJack Humbert2016-12-121-6/+2
|\ \ \
| * | | Remove unneeded options to reduce firmware sizePriyadi Iman Nurcahyo2016-12-101-6/+2
| | |/ | |/|
* | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
* | | readme updateslucwastiaux2016-12-101-1/+4
* | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10151-609/+11350
|\| |
| * | Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
| |\ \
| | * | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| | * | Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
| * | | Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-052-2/+2
| |\ \ \
| | * | | Update planck.cJack Humbert2016-12-041-14/+0
| | * | | Update rules.mkJack Humbert2016-12-041-3/+2
| | * | | Initial version of Raw HID interfaceWilba65822016-12-012-2/+17
| * | | | Remove unnecessary build optionsPriyadi Iman Nurcahyo2016-12-052-4/+5
| * | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \