summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Adding update of vagrant VM every time it is booteddragon7882016-01-052-14/+46
| * | | Adding Vagrantfile for easier compile environment setupdragon7882016-01-033-0/+69
| * | | Added calculator shortcut button to numpad/symbol layerdragon7882016-01-021-2/+2
| * | | Fixed Plover layer label and updated keymapdragon7882016-01-021-4/+4
| * | | Added proper link back to Plover layout sourcedragon7882016-01-021-1/+1
| * | | Added plover layerdragon7882016-01-021-4/+49
| * | | 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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added keymap_j3rn_README.mdJonathan Arnett2016-01-161-0/+28
| * | | | | Change lower-left control to momentary L1Jonathan Arnett2016-01-151-2/+2
| * | | | | Version 1.0.0Jonathan Arnett2016-01-151-0/+186
| | |/ / / | |/| | |
| | | | * keymap.c changes, disable grep stuffJack Humbert2016-01-209-155/+58
| | | | * Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into...Jack Humbert2016-01-160-0/+0
| | | | |\
| | | | | * I guess I can reference #90 in the commit messageJack Humbert2016-01-161-38/+0
| | | | * | I guess I can reference #90 in the commit messageJack Humbert2016-01-162-38/+3
| | | | |/
| | | | * added error for keymap file not existingJack Humbert2016-01-161-0/+4
| | | | * new keymap folder structure and makefile magicJack Humbert2016-01-1621-48/+228
| | | | * workingJack Humbert2016-01-162-0/+17
| |_|_|/ |/| | |
* | | | 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