summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1422-1/+687
|\
| * Merge pull request #634 from di0ib/masterJack Humbert2016-08-1417-0/+440
| |\
| | * moved to handwired folderdi0ib2016-08-1417-3/+3
| | * Merge branch 'master' of https://github.com/di0ib/qmk_firmwaredi0ib2016-08-141-0/+2
| | |\
| | | * Updated readmedi0ib2016-08-141-0/+2
| | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib2016-08-1422-9/+1234
| | |\ \ | | |/ / | |/| / | | |/
| * | 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
| |\ \ \ \ | | |_|/ / | |/| | |
| | | | * cleanup readmedi0ib2016-08-141-3/+3
| | | | * Correct data pin to D5di0ib2016-08-141-1/+1
| | | | * Fix listdi0ib2016-08-141-9/+9
| | | | * clean up readnmedi0ib2016-08-141-8/+10
| | | | * Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib2016-08-1454-1420/+3698
| | | | |\ | | |_|_|/ | |/| | |
| | | | * minorcadi0ib2016-08-1417-0/+436
* | | | | Setup the bottom-row modifiers to be mac-like in their arrangement.Xyverz2016-08-141-3/+3
| |/ / / |/| | |
* | | | 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