aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman2016-07-249-214/+855
|\
| * ergodox_ez: Update my keymap to v1.3Gergely Nagy2016-07-189-214/+855
* | update broken linkSeth Chandler2016-07-171-1/+1
|/
* Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
|\
| * Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| * Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-11/+5
| |\
| * | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| * | Added new keymapJosh Colbeck2016-07-041-0/+191
| * | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| * | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
* | | fix/annotate wait_us linesJack Humbert2016-07-061-0/+12
| |/ |/|
* | Adds wait to i2c (debounce)Jack Humbert2016-07-041-3/+3
* | Improves debounceJack Humbert2016-07-042-9/+3
|/
* Moves features to their own files (process_*), adds tap dance feature (#460)Jack Humbert2016-06-291-2/+1
* zoom and undo keysAnand Babu (AB) Periasamy2016-06-263-26/+40
* Merge pull request #440 from abperiasamy/ergo-ab-swap-up-downErez Zukerman2016-06-244-14/+26
|\
| * Swap up and down to match default layoutAnand Babu (AB) Periasamy2016-06-234-14/+26
* | Merge pull request #438 from tkuichooseyou/masterErez Zukerman2016-06-243-0/+1334
|\ \ | |/ |/|
| * Added tkuichooseyou keymap; for vim and OSX usersTeddy Ku2016-06-233-0/+1334
* | updates ez's matrix to specJack Humbert2016-06-231-0/+8
* | Backlight abstraction and other changes (#439)Jack Humbert2016-06-2366-60626/+8
|/
* ergodox_ez: Update the algernon keymap to v1.2Gergely Nagy2016-06-2211-331/+351
* Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)Jack Humbert2016-06-21220-0/+79367