summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-049-26/+2283
|\
| * Merge pull request #68 from waveform80/daves-commentsJack Humbert2016-01-022-1/+1496
| |\
| | * Added comments to LED stuff and included .hex fileDave Jones2016-01-022-1/+1496
| |/
| * Merge pull request #66 from gdiegel/masterJack Humbert2016-01-021-13/+12
| |\
| | * Fix incorrect number of rows on fn layer. Add additional navigation keysGabriel Diegel2016-01-021-4/+3
| | * Use planck-style arrow keysGabriel Diegel2015-12-201-4/+4
| | * Fix typos and add comments, swap plus with equals, swap pipe withGabriel Diegel2015-12-151-11/+11
| * | Merge pull request #67 from waveform80/daves-keymapJack Humbert2016-01-024-11/+217
| |\ \
| | * | Dave's custom keymapDave Jones2016-01-024-11/+217
| |/ /
| * | Merge pull request #63 from MattLeBeauViewpoint/masterErez Zukerman2015-12-311-1/+1
| |\ \
| | * | Small change to filename spelling in READMEMattLeBeauViewpoint2015-12-311-1/+1
| |/ /
| * | Merge pull request #56 from sboesebeck/masterJack Humbert2015-12-231-5/+5
| |\ \
| * | | Updates readmeErez Zukerman2015-12-231-2/+2
| * | | Merge pull request #55 from sboesebeck/masterJack Humbert2015-12-223-1296/+1296
| |\ \ \
| * \ \ \ Merge pull request #53 from sboesebeck/masterJack Humbert2015-12-213-15/+15
| |\ \ \ \
| * \ \ \ \ Merge pull request #52 from technovangelist/masterJack Humbert2015-12-211-0/+366
| |\ \ \ \ \
| | * | | | | swapped the space and enter to get the space under where the thumb is.Technovangelist2015-12-211-4/+4
| | * | | | | first attempt at a working workman layout for the ergodoxezTechnovangelist2015-12-211-0/+366
| |/ / / / /
| * | | | | Merge pull request #47 from pnutster/masterJack Humbert2015-12-191-0/+191
| |\ \ \ \ \
| | * | | | | Fixed keymap "graphic"Piet Nutbey2015-12-191-1/+1
| | * | | | | corrected folderPiet Nutbey2015-12-191-0/+0
| | * | | | | OSX Kinesis-like MappingPiet Nutbey2015-12-191-0/+191
| * | | | | | Merge pull request #46 from sboesebeck/masterJack Humbert2015-12-193-0/+1757
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | minor fixes, added backtick to left thumbblockStephan Bösebeck2015-12-252-1225/+1225
| |_|_|_|/ / |/| | | | |
* | | | | | fix number pad for german keysStephan Bösebeck2015-12-231-5/+5
| |_|_|/ / |/| | | |
* | | | | fixed some typos, learned, DE_-keycodes are for Win, not OSXStephan Bösebeck2015-12-223-1296/+1296
| |_|/ / |/| | |
* | | | new firmware file containing current changesStephan Bösebeck2015-12-221-7/+7
* | | | added png file for layout documentationStephan Bösebeck2015-12-221-0/+0
* | | | minor changes, fixesStephan Bösebeck2015-12-221-8/+8
| |/ / |/| |
* | | added hex fileStephan Bösebeck2015-12-201-1/+1
* | | typo fixStephan Bösebeck2015-12-201-1/+1
* | | minor changeStephan Bösebeck2015-12-201-19/+47
* | | added hex file and readmeStephan Bösebeck2015-12-202-0/+1516
* | | first version for german osx layoutStephan Bösebeck2015-12-201-0/+213
|/ /
* | Merge pull request #45 from matzebond/masterJack Humbert2015-12-195-0/+429
|\ \
| * | Add neo2 keymap and neo2 ergodox layoutMatthias Schmitt2015-12-192-0/+183
| * | Add Ctrl-Shift tap modifierMatthias Schmitt2015-12-191-0/+1
| * | Add german keymap and german ergodox layoutMatthias Schmitt2015-12-192-0/+245
* | | Further clarifies READMEErez Zukerman2015-12-191-3/+5
|/ /
* | Updates readmeErez Zukerman2015-12-181-2/+24
* | jack's ergodox layoutJack Humbert2015-12-171-0/+185
* | Fixes media keys on OSX layoutErez Zukerman2015-12-182-5/+5
* | Adds a new default keymap for OSX with working prev/next keysErez Zukerman2015-12-186-1467/+1654
* | Moves compiled default keymap + legends to keymaps directoryErez Zukerman2015-12-183-0/+1467
* | A compiled version which sends left click in mouse modeErez Zukerman2015-12-161-0/+1466
* | Merge pull request #41 from joshmccall221/right_click_fixErez Zukerman2015-12-161-1/+1
|\ \
| * | Left click was mapped to scroll wheel. This fixes that. :)Josh McCall2015-12-161-1/+1
|/ /
* | Merge pull request #39 from gdiegel/masterJack Humbert2015-12-141-0/+109
|\|
| * Remove redundant definitionsGabriel Diegel2015-12-131-10/+10
| * Rename keymapGabriel Diegel2015-12-131-0/+0