summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21 from cr3473/masterJack Humbert2015-06-031-6/+6
|\ | | | | Layout changes
| * added screenlock mappingcr34732015-06-031-4/+4
| |
| * revert to DEL only on upper layer :)cr34732015-06-031-2/+2
|/
* Merge pull request #20 from cr3473/masterJack Humbert2015-06-022-43/+35
|\ | | | | PCB doc edits and keymap update
| * Merge branch 'master' of github.com:jackhumbert/tmk_keyboardcr34732015-06-020-0/+0
| |\ | |/ |/| | | | | Conflicts: keyboard/planck/PCB_GUIDE.md
* | Merge pull request #19 from cr3473/masterJack Humbert2015-06-022-2/+7
|\ \ | | | | | | Makefile - MATRIX selection
| * \ Merge branch 'master' of github.com:jackhumbert/tmk_keyboardcr34732015-06-026-23/+292
| |\ \ | |/ / |/| |
* | | Merge pull request #18 from angerthosenear/masterJack Humbert2015-06-011-0/+50
|\ \ \ | | | | | | | | Create extended_keymap_angerthosenear.c
| * | | Create extended_keymap_angerthosenear.cangerthosenear2015-06-011-0/+50
|/ / / | | | | | | Adding my keymap to the available keymaps list.
* | | Merge pull request #17 from johnlindquist/patch-1Jack Humbert2015-06-011-0/+5
|\ \ \ | | | | | | | | Update PCB_GUIDE.md
| * | | Update PCB_GUIDE.mdJohn Lindquist2015-06-011-0/+5
|/ / /
* | | guideJack Humbert2015-05-303-24/+65
| | |
* | | Create PCB_GUIDE.mdJack Humbert2015-05-301-0/+110
| | |
* | | danielJack Humbert2015-05-271-1/+1
| | |
* | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-05-271-13/+13
|\ \ \
| * \ \ Merge pull request #16 from cr3473/masterJack Humbert2015-05-271-13/+13
| |\ \ \ | | | | | | | | | | fixed the macros for hard colemak
* | | | | danielJack Humbert2015-05-271-1/+9
|/ / / /
* | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-05-272-61/+127
|\ \ \ \
| * \ \ \ Merge pull request #15 from cr3473/masterJack Humbert2015-05-272-61/+127
| |\ \ \ \ | | | | | | | | | | | | Keymap updates
* | | | | | catching upJack Humbert2015-05-272-0/+55
|/ / / / /
| | | | * PCB Guide edits and update to joe's keymapcr34732015-06-022-43/+35
| | | | |
| | | | * Create extended_keymap_angerthosenear.cangerthosenear2015-06-021-0/+50
| | | | | | | | | | | | | | | | | | | | Adding my keymap to the available keymaps list.
| | | | * Update PCB_GUIDE.mdJohn Lindquist2015-06-021-0/+5
| | | | |
| | | | * guideJack Humbert2015-06-023-24/+65
| | | | |
| | | | * Create PCB_GUIDE.mdJack Humbert2015-06-021-0/+110
| | | | |
| | | | * danielJack Humbert2015-06-021-1/+1
| | | | |
| | | | * danielJack Humbert2015-06-021-1/+9
| | | | |
| | | | * catching upJack Humbert2015-06-022-0/+55
| | | |/
| | | * Added ability to set the MATRIX in build/makecr34732015-06-022-2/+7
| | |/
| | * fixed the macros for hard colemakcr34732015-05-271-13/+13
| |/
| * New, improved, extended layoutcr34732015-05-271-0/+90
| |
| * Merge remote-tracking branch 'upstream/master'cr34732015-05-27133-2154/+6483
| |\ | |/ |/|
* | layouts, defaultJack Humbert2015-05-212-1/+51
| |
* | default w/qwertyJack Humbert2015-05-191-0/+50
| |
* | filesJack Humbert2015-05-183-0/+282
| |
* | quarkJack Humbert2015-05-1514-764/+121
| |
* | backlight stuffJack Humbert2015-05-078-17/+67
| |
* | quarkJack Humbert2015-05-0229-0/+2481
| |
* | Merge pull request #14 from rswiernik/masterJack Humbert2015-04-2915-11/+11
|\ \ | | | | | | Fixed quite a few things
| * | Corrected makefile common varReed Swiernik2015-04-291-1/+1
| | |
| * | Moved keymap file location and fixed bugs in keymap_reed.cReed Swiernik2015-04-2915-10/+10
| | |
* | | Merge pull request #13 from rswiernik/masterJack Humbert2015-04-253-20/+117
|\| | | | | | | | Updated Readme and Build info
| * | Update README.mdReed Swiernik2015-04-251-3/+0
| | |
| * | Update README.mdReed Swiernik2015-04-251-12/+8
| | | | | | | | | | | | Switched around more readme stuff
| * | Update README.mdReed Swiernik2015-04-251-2/+2
| | | | | | | | | | | | This stupid readme...
| * | Update README.mdReed Swiernik2015-04-251-8/+8
| | | | | | | | | | | | Updated formatting again...
| * | Update README.mdReed Swiernik2015-04-251-0/+2
| | | | | | | | | | | | Changed formatting mistake
| * | Updated readme with new build infoReed Swiernik2015-04-251-5/+26
| | |
| * | Changed del key and added docsReed Swiernik2015-04-251-3/+9
| | |
| * | Updated makefile to properly handle non extended keymapsReed Swiernik2015-04-252-11/+20
| | |