summaryrefslogtreecommitdiffstats
path: root/keyboards/planck
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #733 from cbbrowne/masterJack Humbert2016-09-083-15/+38
|\ \ \ \
| * | | | Borrowed joint Shift/Enter idea from sgoodwin mappingcbbrowne2016-09-072-1/+2
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0714-240/+966
| |\| | |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-297-79/+85
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-264-149/+83
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-243-4/+15
| |\ \ \ \ \ \
| * | | | | | | More notescbbrowne2016-08-241-3/+4
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2211-58/+998
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-104-4/+343
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-082-72/+187
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-048-0/+709
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-281-10/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-252-75/+121
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Notes about changesChristopher Browne2016-07-181-8/+8
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-126-74/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra casesChristopher Browne2016-07-121-1/+1
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-071-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-041-0/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-3014-24/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-284-116/+208
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2444-40231/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-237-0/+1443
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFTChristopher Browne2016-06-221-1/+1
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-223-7/+28
* | | | | | | | | | | | | | | | | | | | Added User Print - A "light" console out option (#8)IBNobody2016-09-072-3/+11
* | | | | | | | | | | | | | | | | | | | Use keyboard config for nkro (#7)IBNobody2016-09-062-4/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
* | | | | | | | | | | | | | | | | | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-052-199/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-042-199/+238
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
* | | | | | | | | | | | | | | | | | | | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
* | | | | | | | | | | | | | | | | | | | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-0131-115/+1756
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master'Jason Janse van Rensburg2016-08-3037-97/+2539
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Update READMEJack Henahan2016-08-291-3/+9
| | * | | | | | | | | | | | | | | | | | | jhenahan layoutJack Henahan2016-08-294-0/+383
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-254-149/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge pull request #659 from Dbroqua/masterJack Humbert2016-08-253-139/+73
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | - Updated readme by adding link on kle for each layerdbroqua2016-08-241-0/+3
| | | | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-233-4/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | - Added PrintScreen key on multimedia layerdbroqua2016-08-222-2/+2
| | | | * | | | | | | | | | | | | | | | | - Inverted key Tab and Escdbroqua2016-08-212-12/+12
| | | | * | | | | | | | | | | | | | | | | - Moved Insert/Del in Esc layerdbroqua2016-08-193-7/+7
| | | | * | | | | | | | | | | | | | | | | - Updated lower and raise layerdbroqua2016-08-192-126/+46