Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-14 | 22 | -1/+687 |
|\ | |||||
| * | Merge pull request #634 from di0ib/master | Jack Humbert | 2016-08-14 | 17 | -0/+440 |
| |\ | |||||
| | * | moved to handwired folder | di0ib | 2016-08-14 | 17 | -3/+3 |
| | * | Merge branch 'master' of https://github.com/di0ib/qmk_firmware | di0ib | 2016-08-14 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Updated readme | di0ib | 2016-08-14 | 1 | -0/+2 |
| | * | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | di0ib | 2016-08-14 | 22 | -9/+1234 |
| | |\ \ | | |/ / | |/| / | | |/ | |||||
| * | | Merge pull request #631 from jacwib/master | Jack Humbert | 2016-08-14 | 4 | -0/+246 |
| |\ \ | |||||
| | * | | Fix bug | jacwib | 2016-08-14 | 1 | -1/+1 |
| | * | | Remove pointless comments | jacwib | 2016-08-14 | 1 | -21/+21 |
| | * | | Update readme.md | jacwib | 2016-08-14 | 1 | -1/+2 |
| | * | | Update Makefile | jacwib | 2016-08-14 | 1 | -5/+0 |
| | * | | Update config.h | jacwib | 2016-08-14 | 1 | -1/+0 |
| | * | | Update keymap.c | jacwib | 2016-08-14 | 1 | -1/+1 |
| | * | | Update readme.md | jacwib | 2016-08-14 | 1 | -2/+2 |
| | * | | Jack's keymap. | jacwib | 2016-08-14 | 4 | -0/+251 |
| * | | | Merge pull request #627 from algernon/h/set-unicode-input-mode | Jack Humbert | 2016-08-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | process_unicode: Fix set_unicode_input_mode() | Gergely Nagy | 2016-08-13 | 1 | -1/+1 |
| * | | | | Merge pull request #624 from Xyverz/master | Jack Humbert | 2016-08-14 | 17 | -8/+987 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | | | * | cleanup readme | di0ib | 2016-08-14 | 1 | -3/+3 |
| | | | * | Correct data pin to D5 | di0ib | 2016-08-14 | 1 | -1/+1 |
| | | | * | Fix list | di0ib | 2016-08-14 | 1 | -9/+9 |
| | | | * | clean up readnme | di0ib | 2016-08-14 | 1 | -8/+10 |
| | | | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | di0ib | 2016-08-14 | 54 | -1420/+3698 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| | | | * | minorca | di0ib | 2016-08-14 | 17 | -0/+436 |
* | | | | | Setup the bottom-row modifiers to be mac-like in their arrangement. | Xyverz | 2016-08-14 | 1 | -3/+3 |
| |/ / / |/| | | | |||||
* | | | | Added my own layout to the Phantom. | Xyverz | 2016-08-14 | 1 | -0/+104 |
* | | | | Fixing a mixup. Tidying up the keymap. | Xyverz | 2016-08-13 | 1 | -10/+0 |
* | | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-13 | 50 | -1420/+2937 |
|\| | | | |||||
| * | | | Merge pull request #623 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-08-13 | 6 | -1237/+1244 |
| |\ \ \ | |||||
| | * | | | ergodox: Update my keymap to v1.5 | Gergely Nagy | 2016-08-12 | 6 | -1237/+1244 |
| * | | | | Merge pull request #626 from tenderlove/readme-link | Erez Zukerman | 2016-08-13 | 1 | -2/+2 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | fix link to ErgoDox EZ | Aaron Patterson | 2016-08-12 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | forces all ergodox keymaps to be ez on qmk.fm (were infinity) | Jack Humbert | 2016-08-12 | 1 | -0/+2 |
| * | | | Merge pull request #622 from shelaf/master | Jack Humbert | 2016-08-12 | 7 | -0/+395 |
| |\ \ \ | |||||
| | * | | | add new line | shela | 2016-08-12 | 1 | -1/+1 |
| | * | | | add new line | shela | 2016-08-12 | 1 | -7/+7 |
| | * | | | add my keymap | shela | 2016-08-12 | 7 | -0/+395 |
| | |/ / | |||||
| * | | | Merge pull request #621 from shelaf/fix | Jack Humbert | 2016-08-12 | 1 | -11/+11 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | fix typo | shela | 2016-08-12 | 1 | -11/+11 |
| |/ / | |||||
| * | | Merge pull request #618 from denolfe/master | Jack Humbert | 2016-08-11 | 4 | -0/+203 |
| |\ \ | |||||
| | * | | Add denolfe satan keymap | Elliot DeNolf | 2016-08-11 | 4 | -0/+203 |
| * | | | Merge pull request #617 from iFreilicht/patch-2 | Jack Humbert | 2016-08-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix dead link in keycode.txt | Felix Uhl | 2016-08-11 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge pull request #614 from iFreilicht/patch-1 | Jack Humbert | 2016-08-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | updated reference | Felix Uhl | 2016-08-10 | 1 | -1/+1 |
| | * | | | Update TMK_README.md | Felix Uhl | 2016-08-08 | 1 | -1/+1 |
| * | | | | Merge pull request #608 from finleye/master | Jack Humbert | 2016-08-11 | 4 | -0/+264 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Adds keymap based on Kinesis advantage | Corey Finley | 2016-08-08 | 4 | -0/+264 |
| | |/ / | |||||
| * | | | Update keymap. (#616) | Callum Oakley | 2016-08-09 | 2 | -4/+4 |
| * | | | adds Xyverz's keymaps (#615) | Xyverz | 2016-08-09 | 5 | -0/+771 |