summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2382-503/+4324
|\
| * Merge pull request #833 from h-parks/masterErez Zukerman2016-10-208-0/+482
| |\
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-192-9/+12
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-188-0/+479
| * | Merge pull request #832 from PhoenixRion/masterErez Zukerman2016-10-202-0/+194
| |\ \ | | |/ | |/|
| | * update header fileRyan Ascheman2016-10-181-1/+1
| | * didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-182-0/+0
| | * moving keymap to new locationRyan Ascheman2016-10-182-0/+0
| | * Merge remote-tracking branch 'upstream/master'Ryan Ascheman2016-10-186939-2419915/+106820
| | |\ | | |/ | |/|
| * | Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
| |\ \
| | * | Update ez.cRob Rogers2016-10-181-1/+0
| | * | Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22
| * | | Merge pull request #824 from dsvensson/pegasushoofJack Humbert2016-10-1811-0/+662
| |\ \ \
| | * | | Support the Pegasus Hoof controller.Daniel Svensson2016-10-1311-0/+662
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert2016-10-189-103/+189
| |\ \ \ \
| | * \ \ \ Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman2016-10-179-103/+189
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-169-103/+189
| | | |/ /
| * | / / removes planck/rev3 temporarilyJack Humbert2016-10-181-3/+0
| |/ / /
| * | | Update MakefileJack Humbert2016-10-161-72/+1
| * | | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-169-0/+495
| |\ \ \
| | * | | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
| | * | | Unicode map framework. Allow unicode up to 0xFFFFF using separatePriyadi Iman Nurcahyo2016-10-106-0/+51
| * | | | Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert2016-10-161-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added VS Code dir to .gitignoreJoshua T2016-10-151-0/+1
| |/ / /
| * | | Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
| |\ \ \
| | * | | add readmePavlos Vinieratos2016-10-112-0/+72
| | * | | use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| | * | | add messengerPavlos Vinieratos2016-10-111-2/+3
| | * | | init keymapPavlos Vinieratos2016-10-112-0/+438
| * | | | Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman2016-10-133-7/+12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-123-7/+12
| |/ / /
| * | | Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
| |\ \ \
| | * | | Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| | * | | Merge branch 'master' into coderkun_neo2coderkun2016-10-031-0/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into coderkun_neo2coderkun2016-10-02346-12401/+20510
| | |\ \ \ \
| | * | | | | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
| * | | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman2016-10-103-0/+269
| |\ \ \ \ \ \
| | * | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #808 from npoirey/masterJack Humbert2016-10-102-0/+4
| |\ \ \ \ \ \
| | * | | | | | Updated Readme to help windows users use docker for buildnpoirey2016-10-071-0/+3
| | * | | | | | Add Altgr combination for non US layoutsnpoirey2016-10-071-0/+1
| | |/ / / / /
| * | | | | | Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert2016-10-103-0/+303
| |\ \ \ \ \ \
| | * | | | | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| | |/ / / / /
| * | | | | | Merge pull request #810 from Vifon/dynamic_macrosJack Humbert2016-10-102-4/+9
| |\ \ \ \ \ \
| | * | | | | | Reduce the default dynamic macro bufferWojciech Siewierski2016-10-092-4/+9
| | |/ / / / /
| * | | | | | Merge pull request #814 from fredizzimo/rgb_tuningJack Humbert2016-10-101-22/+33
| |\ \ \ \ \ \
| | * | | | | | CIE 1931 dim curveFred Sundvik2016-10-091-17/+30
| | * | | | | | Apply the dim curve to the RGB outputFred Sundvik2016-10-091-5/+3
| | |/ / / / /
| * | | | | | Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert2016-10-107-0/+84
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update the Cluecard readme filesFred Sundvik2016-10-092-1/+9