summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #836 from 20lives/masterErez Zukerman2016-10-317-472/+695
|\
| * merge upstreamLior Haim2016-10-2323-21/+1360
| |\
| * | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| * | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
| |\ \
| | * | fix readme20lives2016-10-191-2/+2
| * | | fixed base layer = keytwentylives2016-10-201-1/+1
| |/ /
| * | update pics and readmetwentylives2016-10-195-133/+122
| * | Update readme.md20lives2016-10-181-3/+5
| * | Update readme.md20lives2016-10-181-1/+3
| * | adding dvorak hebrew layouttwentylives2016-10-183-0/+230
* | | 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 #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-1435-266/+1856
| |\ \ \
| * | | | - 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 #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 #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
| |/ / / /
* | | | | [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 #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
* | | | | 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/+194
|/ / / /
* | | | 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-163-0/+444
|\ \ \ | |/ / |/| |
| * | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
* | | Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
|\ \ \
| * | | add readmePavlos Vinieratos2016-10-112-0/+72