summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2016-10-302-58/+98
|\
| * Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo2016-10-231-1/+1
| * Update priyadi's keymap for Planck; added readmePriyadi Iman Nurcahyo2016-10-222-57/+97
* | Merge pull request #854 from slebedev/masterJack Humbert2016-10-301-1/+1
|\ \
| * | Add link to article about Unicode Hex Input in readmeSergey Lebedev2016-10-291-1/+1
* | | Merge pull request #857 from fredizzimo/fix_makefile_too_long_bashJack Humbert2016-10-301-8/+23
|\ \ \ | |/ / |/| |
| * | Run each sumbmake in a separate shellFred Sundvik2016-10-301-8/+23
* | | Merge pull request #827 from Dbroqua/masterJack Humbert2016-10-263-6/+88
|\ \ \
| * | | - Added HHKB like layout for KC60 pcbdbroqua2016-10-162-0/+82
| * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-10-1441-293/+1921
| |\ \ \
| | * \ \ Merge pull request #9 from jackhumbert/masterDamien2016-10-1322-35/+1252
| | |\ \ \
| | * \ \ \ Merge pull request #8 from jackhumbert/masterDamien2016-10-0719-258/+669
| | |\ \ \ \
| * | | | | | - Updated dbroqua layout for HHKB keyboard (added some missing fn keys)dbroqua2016-10-031-6/+6
| |/ / / / /
* | | | | | Merge pull request #849 from hot-leaf-juice/masterJack Humbert2016-10-261-4/+4
|\ \ \ \ \ \
| * | | | | | replace lock key with general power keyCallum Oakley2016-10-251-2/+2
| * | | | | | switched to standard volume keysCallum Oakley2016-10-251-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert2016-10-261-1/+2
|\ \ \ \ \ \
| * | | | | | add subproject env var to dockerfileAndre Silva2016-10-241-1/+2
| |/ / / / /
* | | | | | Merge pull request #847 from yinshanyang/masterJack Humbert2016-10-261-0/+13
|\ \ \ \ \ \
| * | | | | | added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang2016-10-241-0/+13
| |/ / / / /
* | | | | | Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert2016-10-262-4/+10
|\ \ \ \ \ \
| * | | | | | Unicode WinCompose input methodPriyadi Iman Nurcahyo2016-10-232-4/+10
| |/ / / / /
* | | | | | Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert2016-10-262-9/+35
|\ \ \ \ \ \
| * | | | | | UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo2016-10-232-9/+35
| |/ / / / /
* | | | | | Merge pull request #841 from jacwib/masterJack Humbert2016-10-263-27/+118
|\ \ \ \ \ \
| * | | | | | 1.2 updatejacwib2016-10-233-20/+105
| * | | | | | Update readme to reflect 1.1 changes.jacwib2016-10-221-1/+1
| * | | | | | Update keymap to reflect 1.1 changes.jacwib2016-10-221-9/+9
| * | | | | | Update readme to reflect changesjacwib2016-10-221-0/+6
| |/ / / / /
* | | | | | Merge pull request #831 from kejadlen/masterJack Humbert2016-10-265-0/+261
|\ \ \ \ \ \
| * | | | | | [alphadox] remove tmk reset codeAlpha Chen2016-10-252-10/+0
| * | | | | | [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen2016-10-251-0/+3
| * | | | | | add alphadox layouts to atreus and ergodoxAlpha Chen2016-10-255-0/+268
| |/ / / / /
* | | | | | Merge pull request #834 from kazufukurou/masterJack Humbert2016-10-261-0/+82
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add programmer dvorak keymapArtyom Mironov2016-10-191-0/+82
* | | | | | 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
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |