summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #94 from plgruener/german_aliasesJack Humbert2016-01-191-0/+39
|\
| * complete keymap_german.h (all alphanumerics)plgruener2016-01-191-0/+39
|/
* Makes ' into a dual-action key for LGuiErez Zukerman2016-01-191-3/+4
* Adds an experimental keymap for my own useErez Zukerman2016-01-191-0/+189
* Merge pull request #73 from dragon788/dragon_modErez Zukerman2016-01-188-1/+645
|\
| * Command line programming not default, enable by reading quickstart and commen...dragon7882016-01-172-7/+11
| * Allow passthru of Teensy to Virtualbox for programmingdragon7882016-01-171-5/+11
| * Fixing Debian/Ubuntu updates to be completely non-interactivedragon7882016-01-171-1/+9
| * Note about Virtualbox incompatibilitiesdragon7882016-01-171-0/+2
| * Update README.mddragon7882016-01-161-0/+1
| * Create QUICK_START.md describing Vagrantfile usagedragon7882016-01-161-0/+21
| * Having media layer defined causes toggles to 'stick' rather than be momentary...dragon7882016-01-161-1/+1
| * Resetting keymap_default.c to origin/master not just my fork's masterdragon7882016-01-161-23/+23
| * Moving my layout to its own file, made plover layout file, restoring default ...dragon7882016-01-163-89/+501
| * Updated avr script and added notes to Vagrantfiledragon7882016-01-162-7/+18
| * All dfu dependencies in place, multi-line syntax to make it easy to add/readdragon7882016-01-121-4/+37
| * 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
| |\ \ \ | |/ / / |/| | |
* | | | 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
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |