summaryrefslogtreecommitdiffstats
path: root/keyboards/planck/keymaps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #736 from tong92/masterJack Humbert2016-09-083-0/+274
|\ | | | | add tong92 keymap
| * add tong92 keymaptong922016-09-083-0/+274
| |
* | Merge pull request #733 from cbbrowne/masterJack Humbert2016-09-083-15/+38
|\ \ | | | | | | Various recent enhancements to my keyboard map
| * | 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-264-149/+83
| |\ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-242-4/+5
| |\ \ \
| * | | | 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-06-303-23/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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-2439-39902/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User print disables the normal print messages in the body of QMK/TMK code and is meant as a lightweight alternative to NOPRINT. Use it when you only want to do a spot of debugging but lack flash resources for allowing all of the codebase to print (and store their wasteful strings).
* | | | | | | | | | | | | | | | | | Use keyboard config for nkro (#7)IBNobody2016-09-062-4/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removing nkro references - wip * changed NKRO to be defined by keymap_config
* | | | | | | | | | | | | | | | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add my keymap.
| * | | | | | | | | | | | | | | | | Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-052-199/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docs to show more info on backlight breathing.
| * | | | | | | | | | | | | | | | | | 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-0123-36/+1661
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master'Jason Janse van Rensburg2016-08-3029-18/+2444
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
| | * | | | | | | | | | | | | | | | | Update READMEJack Henahan2016-08-291-3/+9
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | jhenahan layoutJack Henahan2016-08-294-0/+383
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge pull request #659 from Dbroqua/masterJack Humbert2016-08-253-139/+73
| | |<