summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Fixed button conflicts on mouse/media layerdragon7882015-12-301-18/+18
| * | | Added note about avr-libc also being required at least for archdragon7882015-12-301-1/+1
| * | | Moving everything around, tap delays driving me nutsdragon7882015-12-301-27/+27
| * | | Merge branch 'master' of github.com:dragon788/qmk_firmware_ezdragon7882015-12-280-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of github.com:dragon788/qmk_firmware_ezdragon7882015-12-271-21/+21
| | |\ \ \
| * | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwaredragon7882015-12-2821-4/+6076
| |\| | | | | | |/ / / | |/| | |
| * | | | Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis...dragon7882015-12-231-20/+20
| * | | | add left click and vim keysJosh McCall2015-12-161-2/+2
* | | | | Merge pull request #93 from petereichinger/masterJack Humbert2016-01-182-0/+24
|\ \ \ \ \
| * | | | | Fix code formatting in international characters readme entryPeter Eichinger2016-01-181-2/+2
| * | | | | Readme for LCAG modifier combo and international characters with AutoHotkeyPeter Eichinger2016-01-181-0/+22
| * | | | | Add defines for CtrlAltGui modifiersPeter Eichinger2016-01-181-0/+2
|/ / / / /
* | | | | Merge pull request #88 from J3RN/j3rn-keymapErez Zukerman2016-01-162-0/+214
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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