aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-289-24/+33
|\
| * Merge pull request #572 from algernon/f/tap-dance-debugJack Humbert2016-07-282-0/+16
| |\
| | * tap-dance: Add some debugging supportGergely Nagy2016-07-272-0/+16
| * | Merge pull request #570 from sethbc/fix_bone2planck_buildJack Humbert2016-07-281-10/+8
| |\ \
| | * | remove unnecessary includesSeth Chandler2016-07-271-2/+0
| | * | fix numerous errors in bone2planck keymapSeth Chandler2016-07-271-10/+10
| | |/
| * | Merge pull request #569 from sethbc/fix_stanleylai_warningsJack Humbert2016-07-281-10/+5
| |\ \
| | * | kill warnings filling up travis buildlogSeth Chandler2016-07-271-10/+5
| | |/
| * | Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert2016-07-281-1/+1
| |\ \
| | * | update NO_AMP to NO_AMPRSeth Chandler2016-07-271-1/+1
| | |/
| * | Merge pull request #566 from SmackleFunky/masterJack Humbert2016-07-281-2/+2
| |\ \
| | * | Allow toggling out of plover layerSmackleFunky2016-07-271-2/+2
| | |/
| * | Merge pull request #559 from Talljoe/fix-compiler-warningJack Humbert2016-07-281-1/+1
| |\ \
| | * | Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.Joe Wasson2016-07-241-1/+1
| * | | Merge pull request #564 from mazinbokhari/masterJack Humbert2016-07-282-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Move to keyboardsMazin Bokhari2016-07-262-0/+0
| |/ /
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-273-1/+376
|\| |
| * | Merge pull request #562 from michaelklos/docErez Zukerman2016-07-261-1/+26
| |\ \
| | * | Added Tap Dance ExampleMichael Klos2016-07-261-1/+26
| * | | Merge pull request #533 from mazinbokhari/masterErez Zukerman2016-07-262-0/+350
| |\ \ \ | | |/ / | |/| |
| | * | Delete default.pngerlo muvman2016-07-251-0/+0
| | * | Delete default_highres.pngerlo muvman2016-07-251-0/+0
| | * | Update readme.mderlo muvman2016-07-251-18/+18
| | * | Update readme.mderlo muvman2016-07-251-18/+18
| | * | Update readme.mderlo muvman2016-07-251-6/+0
| | * | Update readme. My layout optimized for emacs & vimMazin Bokhari2016-07-171-0/+1
| | * | Update readme. My layout optimized for emacs & vimMazin Bokhari2016-07-171-27/+61
| | * | Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmwareMazin Bokhari2016-07-171-5/+87
| | |\ \
| | | * | Update readme.mdMazin Bokhari2016-06-221-1/+1
| | | * | Update readme.mdMazin Bokhari2016-06-221-50/+49
| | | * | Update readme.mdMazin Bokhari2016-06-221-1/+1
| | | * | Update readme.mdMazin Bokhari2016-06-221-1/+14
| | | * | Update readme.mdMazin Bokhari2016-06-221-22/+22
| | | * | Update readme.mdMazin Bokhari2016-06-221-0/+70
| | * | | Add caps lock; sucks that there is no light for it...Mazin Bokhari2016-07-171-6/+2
| | * | | Remove more keysMazin Bokhari2016-07-171-9/+9
| | * | | Move dot in symbol layerMazin Bokhari2016-07-171-4/+4
| | * | | Move modifier kyes aroundMazin Bokhari2016-07-171-7/+7
| | * | | Remove more unnecessary buttonsMazin Bokhari2016-07-171-4/+4
| | * | | Add page up/down and home/end to arrowMazin Bokhari2016-07-171-7/+7
| | * | | Change visualMazin Bokhari2016-07-171-2/+2
| | * | | Reorganize media keysMazin Bokhari2016-07-171-13/+13
| | * | | Remove unnecessary modifiersMazin Bokhari2016-07-171-8/+8
| | * | | Edit visual keymapMazin Bokhari2016-07-171-9/+9
| | * | | Add arrow keys to layerMazin Bokhari2016-07-171-1/+1
| | * | | Minor changesMazin Bokhari2016-07-171-3/+3
| | * | | Add empty arrow layer, reorder some keys in media, map layer keysMazin Bokhari2016-07-171-11/+54
| | |/ /
| | * | Fix formattingMazin Bokhari2016-05-261-1/+1
| | * | Fix formattingMazin Bokhari2016-05-261-1/+1
| | * | Change bottom keycluster keys to be alt temporarily until a more permanent so...Mazin Bokhari2016-05-251-3/+4