summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bugfixStephan Bösebeck2016-01-131-1/+1
* updated ANDW layoutStephan Bösebeck2016-01-132-14/+17
* Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-132-1230/+1236
|\
| * added mouse wheel support, CMD-V/CMD-C instead of CTRLStephan Bösebeck2016-01-101-3/+3
| * removed left space key in favor of a backspaceStephan Bösebeck2016-01-092-1219/+1225
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-092-1/+186
| |\
| * \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-068-0/+3761
| |\ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-049-26/+2283
| |\ \ \
| * | | | minor fixes, added backtick to left thumbblockStephan Bösebeck2015-12-252-1225/+1225
* | | | | andw layout addedStephan Bösebeck2016-01-131-0/+259
* | | | | Disables debug console by default for improved performanceErez Zukerman2016-01-122-1221/+1226
* | | | | Merge pull request #80 from agriffis/kinesis-cloneErez Zukerman2016-01-102-0/+203
|\ \ \ \ \
| * | | | | Rename to keymap_kines-ish.c and add READMEAron Griffis2016-01-102-0/+19
| * | | | | Add ergodox_ez keymap to match Kinesis Contoured.Aron Griffis2016-01-091-0/+184
| | |_|_|/ | |/| | |
* | | | | Merge pull request #79 from agriffis/cleanup-defaultErez Zukerman2016-01-101-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refer to SYMB and MDIA in default ergodox_ez keymap.Aron Griffis2016-01-091-3/+3
|/ / / /
* | | | Merge pull request #77 from chwilk/masterJack Humbert2016-01-081-0/+184
|\ \ \ \
| * | | | Moving around modifiers to match KA betterchwilk2016-01-081-11/+11
| * | | | Added keymap variant to approximate Kin Advchwilk2015-12-201-0/+184
* | | | | Merge pull request #74 from sethherr/patch-3Jack Humbert2016-01-061-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix homebrew referencesSeth Herr2016-01-061-1/+2
|/ / / /
* | | | Merge pull request #60 from rothgar/dvorakJack Humbert2016-01-063-0/+368
|\ \ \ \
| * | | | added jgarr keymap for custom dvorak layout :yay:Justin Garrison2016-01-041-0/+184
| * | | | added dvorak keymap and layout pictureJustin Garrison2015-12-302-0/+184
* | | | | Merge pull request #70 from sperochon/ergodox_ez_frJack Humbert2016-01-063-0/+1735
|\ \ \ \ \
| * | | | | ergodox_ez: Add keymap_osx_fr hex fileSébastien Pérochon2016-01-051-0/+1471
| * | | | | ergodox_ez: Add French keymap for OSX (keymap_osx_fr) based on keymap_default...Sébastien Pérochon2016-01-051-0/+187
| * | | | | quantum: Add French keymap for OSX (keymap_french_osx)Sébastien Pérochon2016-01-051-0/+77
| | |_|_|/ | |/| | |
* | | | | Merge pull request #71 from andruby/andrew_osxJack Humbert2016-01-062-0/+1658
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Andrew's OSX ergodox ez keymapAndrew Fecheyr2016-01-052-0/+1658
|/ / / /
* | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | fix number pad for german keysStephan Bösebeck2015-12-231-5/+5
* | | | Updates readmeErez Zukerman2015-12-231-2/+2
* | | | Merge pull request #55 from sboesebeck/masterJack Humbert2015-12-223-1296/+1296
|\| | |
| * | | fixed some typos, learned, DE_-keycodes are for Win, not OSXStephan Bösebeck2015-12-223-1296/+1296
* | | | Merge pull request #53 from sboesebeck/masterJack Humbert2015-12-213-15/+15
|\| | |
| * | | 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
* | | | Merge pull request #52 from technovangelist/masterJack Humbert2015-12-211-0/+366
|\ \ \ \