summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #631 from jacwib/masterJack Humbert2016-08-144-0/+246
|\
| * Fix bugjacwib2016-08-141-1/+1
| * Remove pointless commentsjacwib2016-08-141-21/+21
| * Update readme.mdjacwib2016-08-141-1/+2
| * Update Makefilejacwib2016-08-141-5/+0
| * Update config.hjacwib2016-08-141-1/+0
| * Update keymap.cjacwib2016-08-141-1/+1
| * Update readme.mdjacwib2016-08-141-2/+2
| * Jack's keymap.jacwib2016-08-144-0/+251
* | Merge pull request #627 from algernon/h/set-unicode-input-modeJack Humbert2016-08-141-1/+1
|\ \
| * | process_unicode: Fix set_unicode_input_mode()Gergely Nagy2016-08-131-1/+1
* | | Merge pull request #624 from Xyverz/masterJack Humbert2016-08-1417-8/+987
|\ \ \ | |_|/ |/| |
| * | Added my own layout to the Phantom.Xyverz2016-08-141-0/+104
| * | Fixing a mixup. Tidying up the keymap.Xyverz2016-08-131-10/+0
| * | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1350-1420/+2937
| |\ \ | |/ / |/| |
* | | Merge pull request #623 from algernon/ergodox-ez/algernonErez Zukerman2016-08-136-1237/+1244
|\ \ \
| * | | ergodox: Update my keymap to v1.5Gergely Nagy2016-08-126-1237/+1244
* | | | Merge pull request #626 from tenderlove/readme-linkErez Zukerman2016-08-131-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix link to ErgoDox EZAaron Patterson2016-08-121-2/+2
|/ / /
* | | forces all ergodox keymaps to be ez on qmk.fm (were infinity)Jack Humbert2016-08-121-0/+2
* | | Merge pull request #622 from shelaf/masterJack Humbert2016-08-127-0/+395
|\ \ \
| * | | add new lineshela2016-08-121-1/+1
| * | | add new lineshela2016-08-121-7/+7
| * | | add my keymapshela2016-08-127-0/+395
| |/ /
* | | Merge pull request #621 from shelaf/fixJack Humbert2016-08-121-11/+11
|\ \ \ | |/ / |/| |
| * | fix typoshela2016-08-121-11/+11
|/ /
* | Merge pull request #618 from denolfe/masterJack Humbert2016-08-114-0/+203
|\ \
| * | Add denolfe satan keymapElliot DeNolf2016-08-114-0/+203
* | | Merge pull request #617 from iFreilicht/patch-2Jack Humbert2016-08-111-1/+1
|\ \ \
| * | | Fix dead link in keycode.txtFelix Uhl2016-08-111-1/+1
| |/ /
* | | Merge pull request #614 from iFreilicht/patch-1Jack Humbert2016-08-111-1/+1
|\ \ \
| * | | updated referenceFelix Uhl2016-08-101-1/+1
| * | | Update TMK_README.mdFelix Uhl2016-08-081-1/+1
* | | | Merge pull request #608 from finleye/masterJack Humbert2016-08-114-0/+264
|\ \ \ \ | |_|/ / |/| | |
| * | | Adds keymap based on Kinesis advantageCorey Finley2016-08-084-0/+264
| |/ /
* | | Update keymap. (#616)Callum Oakley2016-08-092-4/+4
* | | adds Xyverz's keymaps (#615)Xyverz2016-08-095-0/+771
* | | Add support for the cluecardskullY2016-08-089-0/+484
* | | Clueboard: Fix the title in keymaps/skully/readme.mdskullY2016-08-081-1/+1
* | | Clueboard: Add some readme.md files and do some minor cleanup.skullY2016-08-086-14/+101
* | | Merge pull request #613 from di0ib/masterJack Humbert2016-08-081-0/+5
|\ \ \
| * | | Convert hex to bindi0ib2016-08-071-0/+5
| * | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib2016-08-07356-2789/+13709
| |\| |
* | | | Merge pull request #612 from kuel/masterJack Humbert2016-08-082-2/+81
|\ \ \ \
| * | | | Removed unnecessary commentkuel2016-08-071-2/+0
| * | | | Add keymap_russian.h, a software implementation of Russiankuel2016-08-072-2/+83
| * | | | Merge pull request #1 from jackhumbert/masterkuel2016-08-037-511/+574
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge pull request #609 from sethbc/fix_clueboard_orphaned_filesJack Humbert2016-08-082-134/+0
|\ \ \ \ \
| * | | | | remove orphaned clueboard filesSeth Chandler2016-08-052-134/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #607 from jeebak/jeebakJack Humbert2016-08-082-72/+187
|\ \ \ \ \ | |/ / / / |/| | | |