summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/IBNobody/qmk_firmware into pc_planckIBNobody2016-04-130-0/+0
|\
| * Merge remote-tracking branch 'refs/remotes/origin/pc_planck'IBNobody2016-04-138-87/+479
| |\
* | | Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planckIBNobody2016-04-130-0/+0
|\| |
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-1347-2736/+11041
| |\ \
* | | | Compiler Warnings / Atomic TLCIBNobody2016-04-1311-35/+113
| |_|/ |/| | | | | | | | | | | Corrected compiler warnings for a number of issues. Gave Atomic some TLC.
* | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1347-2736/+11041
|\ \ \ | | |/ | |/|
| * | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
| |\ \ | | | | | | | | Version 3, Ordinary Perfected
| | * | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| | | |
| | * | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| | | |
| | * | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
| | | |
| * | | Merge pull request #248 from J3RN/masterErez Zukerman2016-04-122-18/+20
| |\ \ \ | | | | | | | | | | Vim-style navigation for j3rn layout
| | * | | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
| |/| | | | | | | | | | | | | Added Vim-style navigation
| | * | | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| | | | |
| | * | | Stylistic changesJonathan Arnett2016-04-111-1/+1
| | | | |
| | * | | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| | | | |
| | * | | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| | | | |
| | * | | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
| | | | |
| * | | | Merge pull request #246 from romanzolotarev/masterErez Zukerman2016-04-115-5/+1331
| |\ \ \ \ | | | | | | | | | | | | Add a new layout with arrows in the home row
| | * | | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
| | | | | |
| * | | | | Merge pull request #244 from nicosuave/add_nico_planck_keymapJack Humbert2016-04-111-0/+69
| |\ \ \ \ \ | | | | | | | | | | | | | | Add nico keymap
| | * | | | | Add my keymapNico Ritschel2016-04-091-0/+69
| | | | | | |
| * | | | | | Merge pull request #236 from tak3over/masterJack Humbert2016-04-112-49/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Minor Doc Changes.
| | * | | | | | another modification of layers, restored arrow keys and added cut/pastetak3over2016-04-071-13/+31
| | | | | | | |
| | * | | | | | switched raise and lower layerstak3over2016-04-061-16/+13
| | | | | | | |
| | * | | | | | updated my keymaptak3over2016-04-051-3/+1
| | | | | | | |
| | * | | | | | Modified keymaptak3over2016-04-051-29/+10
| | | | | | | |
| | * | | | | | Update tak3over.ctak3over2016-04-041-27/+27
| | | | | | | |
| | * | | | | | Merge pull request #2 from jackhumbert/mastertak3over2016-04-0415-1346/+6131
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update from source
| | * \ \ \ \ \ \ Merge pull request #1 from tak3over/tak3over-patch-1tak3over2016-04-041-5/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Minor documentation error. Raise and Lower.
| | | * | | | | | | Minor documentation error. Raise and Lower.tak3over2016-04-041-5/+5
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively. Probably is the same in the other custom keymaps that copied from this default.
| * | | | | | | | Merge pull request #247 from NoahAndrews/fix-path-scriptJack Humbert2016-04-111-2/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix important bugs in the path script for Windows
| | * | | | | | | | Added admin privilege checkNoahAndrews2016-04-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running this as a non-administrator appears to work at first, but the changes wouldn't stick on my Win 8.1 system. It's weird, but this script needs to run as admin.
| | * | | | | | | | Updated commentNoahAndrews2016-04-111-1/+1
| | | | | | | | | |
| | * | | | | | | | Remove failing checkNoahAndrews2016-04-111-1/+0
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NEWPATH1 (C:\MinGW\msys\bin) won't actually be created until the second script is run
| * | | | | | | | Merge pull request #232 from IBNobody/masterJack Humbert2016-04-111-29/+51
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Added Error Checking to 2nd Setup Script
| * | | | | | | | Links to build guideErez Zukerman2016-04-031-1/+1
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #182 from Vifon/modifier-release-fixErez Zukerman2016-04-065-7/+124
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix the layer-dependent modifiers handling
| | * | | | | | | Refactor the source layer cache encodingWojciech Siewierski2016-04-053-41/+71
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into ↵Wojciech Siewierski2016-04-03220-42725/+47824
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modifier-release-fix
| | * | | | | | | | Update PREVENT_STUCK_MODIFIERS documentation in READMEWojciech Siewierski2016-04-021-2/+3
| | | | | | | | | |
| | * | | | | | | | Cleanup after mergeWojciech Siewierski2016-04-021-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove a superfluous parenthesis - wrap lines longer than 80 characters - add const specifiers where appropriate - remove unnecessary casts
| | * | | | | | | | Merge branch 'modifier-release-fix' of ↵Wojciech Siewierski2016-04-022-5/+16
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eltang/qmk_firmware into modifier-release-fix
| | | * | | | | | | | Update action.celtang2016-04-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.celtang2016-04-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.celtang2016-04-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.celtang2016-04-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.celtang2016-04-021-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.celtang2016-04-021-1/+2
| | | | | | | | | | |
| | | * | | | | | | | Update action.cEric-L-T2016-04-011-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Update action.cEric-L-T2016-04-011-8/+8
| | | | | | | | | | |