summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into j3rn-keymapJonathan Arnett2016-01-1637-2773/+10290
|\
| * Merge pull request #89 from coderkun/masterErez Zukerman2016-01-151-0/+137
| |\
| | * merge upstreamcoderkun2016-01-150-0/+0
| | |\
| | * | merge upstreamcoderkun2016-01-1516-2460/+3838
| | * | add basic layer 2coderkun2016-01-152-16/+16
| | * | add basic layer 1coderkun2016-01-121-2/+45
| | * | add neo2 keymap for ergodoxEZcoderkun2016-01-121-0/+94
| * | | Merge pull request #87 from sboesebeck/masterErez Zukerman2016-01-154-1519/+1672
| |\ \ \ | | |_|/ | |/| |
| | * | updated cheat sheet, hex fileStephan Bösebeck2016-01-152-1494/+1508
| | * | using keymap_german_osx.h more, adding macros for CTRL/CMD-V combinationStephan Bösebeck2016-01-152-25/+164
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-139-0/+1108
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #84 from sboesebeck/masterErez Zukerman2016-01-135-1239/+1504
| |\ \ \
| * \ \ \ Merge pull request #83 from lxol/feature/hhkb-qmkJack Humbert2016-01-139-0/+1108
| |\ \ \ \
| | * | | | migrate hhkb to QMK firmwareAlex Olkhovskiy2016-01-139-0/+1108
| | | |_|/ | | |/| |
| | | | * Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-135-13/+272
| | | | |\ | | | | |/ | | | |/|
| | | * | updating layout pngStephan Bösebeck2016-01-131-0/+0
| | | * | adding fixed hex fileStephan Bösebeck2016-01-131-9/+9
| | | * | typo fixStephan Bösebeck2016-01-131-1/+1
| | | * | added adnw layoutStephan Bösebeck2016-01-131-0/+262
| | | * | typo and copy past fixStephan Bösebeck2016-01-131-262/+0
| | | * | minor fixStephan Bösebeck2016-01-131-5/+2
| | | * | 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
| | | |\ \
| | | * | | andw layout addedStephan Bösebeck2016-01-131-0/+259
| | |/ / / | |/| | |
| | | | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-125-1224/+1432
| | | |/| | | |_|/ | |/| |
| * | | 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
| |/ /
| | * 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 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-068-0/+3761
| | | |\ | | |_|/ | |/| |
| * | | 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
| |/ / / /