summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Tap for ;, hold for GUI, tap for ", hold for AltJeeBak Kim2016-08-072-6/+10
| | * | | Tap for Tab, hold for HyperJeeBak Kim2016-08-072-27/+32
| | * | | Add Tab Close, New, Reopen macros to TouchCursor layerJeeBak Kim2016-08-062-7/+22
| | * | | Add Virtual Desktop Switching macros to TouchCursor layerJeeBak Kim2016-08-062-4/+14
| | * | | Move KC_ACL1 buttonJeeBak Kim2016-08-062-6/+6
| | * | | Fix KC_ALT_TAB/KC_CMD_TAB logicJeeBak Kim2016-08-061-3/+3
| | * | | Mouse layer updatesJeeBak Kim2016-08-052-23/+23
| | * | | Revert swapp of AltTab/CmdTab in readme. Layout did not changeJeeBak Kim2016-08-041-1/+1
| | * | | Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP settingJeeBak Kim2016-08-032-9/+50
| | * | | Add CmdSlash to TouchCursor LayerJeeBak Kim2016-08-031-1/+5
| | * | | Number layer tweaksJeeBak Kim2016-08-032-6/+6
| | * | | Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and ...JeeBak Kim2016-08-032-8/+43
| | * | | Update readme.mdJeeBak Kim2016-08-031-6/+7
| |/ / /
* | | | Removal of old minivan44 folder.Ian Sterling2016-08-1313-564/+0