summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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
* | | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-121-6/+6
|/ /
* | 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-02263-7841/+14564
| |\ \
| * | | 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 #811 from Vifon/planck_keymap_vifonJack Humbert2016-10-103-0/+303
|\ \ \ \
| * | | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| |/ / /
* | | | Update the Cluecard readme filesFred Sundvik2016-10-092-1/+9
* | | | Tune snake and knight intervals for CluecardFred Sundvik2016-10-091-0/+3
* | | | Tune the snake and knight effect parameters for CluecardFred Sundvik2016-10-091-0/+3
* | | | Add keymap with audio disabled but RGB effects enabledFred Sundvik2016-10-094-0/+58
|/ / /
* | | Merge pull request #807 from hot-leaf-juice/masterJack Humbert2016-10-062-7/+7
|\ \ \
| * | | updated readmeCallum Oakley2016-10-061-3/+3
| * | | added lock screen button and fixed error in diagramCallum Oakley2016-10-061-4/+4
* | | | Merge pull request #805 from SethSenpai/gamenumJack Humbert2016-10-067-0/+443
|\ \ \ \ | |/ / / |/| | |
| * | | updated the wrong makefile like a dummySethSenpai2016-10-041-73/+3
| * | | added rules.mkSethSenpai2016-10-041-0/+73
| * | | updated readme with imagesSethSenpai2016-10-031-1/+9
| * | | update readmeSethSenpai2016-10-031-6/+8
| * | | moved folder, update readmeSethSenpai2016-10-036-1/+1
| * | | added gamenum handwired keyboardSethSenpai2016-10-036-0/+430
| | |/ | |/|
* | | ergodox: Update algernon's keymap to v1.8Gergely Nagy2016-10-039-175/+212
* | | Merge pull request #798 from Dbroqua/masterJack Humbert2016-10-031-13/+35
|\ \ \
| * | | - Fixed key name in default layer definitiondbroqua2016-10-011-1/+1
| * | | Merge remote-tracking branch 'origin/master'dbroqua2016-10-0121-684/+1244
| |\| |