summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-07-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-07-28Merge pull request #572 from algernon/f/tap-dance-debugJack Humbert
2016-07-28Merge pull request #570 from sethbc/fix_bone2planck_buildJack Humbert
2016-07-28Merge pull request #569 from sethbc/fix_stanleylai_warningsJack Humbert
2016-07-28Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert
2016-07-28Merge pull request #566 from SmackleFunky/masterJack Humbert
2016-07-28Merge pull request #559 from Talljoe/fix-compiler-warningJack Humbert
2016-07-28Merge pull request #564 from mazinbokhari/masterJack Humbert
2016-07-27Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-07-27tap-dance: Add some debugging supportGergely Nagy
2016-07-27remove unnecessary includesSeth Chandler
2016-07-27fix numerous errors in bone2planck keymapSeth Chandler
2016-07-27kill warnings filling up travis buildlogSeth Chandler
2016-07-27update NO_AMP to NO_AMPRSeth Chandler
2016-07-27Allow toggling out of plover layerSmackleFunky
2016-07-26Move to keyboardsMazin Bokhari
2016-07-26Merge pull request #562 from michaelklos/docErez Zukerman
2016-07-26Merge pull request #533 from mazinbokhari/masterErez Zukerman
2016-07-26Added Tap Dance ExampleMichael Klos
2016-07-26Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-07-26disable midi by defaultJack Humbert
2016-07-25Delete default.pngerlo muvman
2016-07-25Delete default_highres.pngerlo muvman
2016-07-25Update readme.mderlo muvman
2016-07-25Update readme.mderlo muvman
2016-07-25Update readme.mderlo muvman
2016-07-25Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-07-25Merge pull request #558 from lindhe/masterJack Humbert
2016-07-25Change Nordic ampersand code to match the EnglishAndreas Lindhé
2016-07-25Fix misspelled command in Norwegian helperAndreas Lindhé
2016-07-24Fixes midi functionalityJack Humbert
2016-07-24Merge pull request #554 from robertdale/music-recording-documentationJack Humbert
2016-07-24Merge pull request #552 from robertdale/music-play-fixJack Humbert
2016-07-24Merge pull request #550 from Darthabel/fix_bepoJack Humbert
2016-07-24Merge pull request #549 from locksmithdon/patch-1Jack Humbert
2016-07-24Merge pull request #548 from CommandLineDesign/CMD-PreonicJack Humbert
2016-07-24Merge pull request #546 from sethbc/satan-cleanupJack Humbert
2016-07-24Merge pull request #534 from willwm/teckinesisErez Zukerman
2016-07-24Remove images, per @ezuk request. =)Will Wolff-Myren
2016-07-24Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.Joe Wasson
2016-07-24Merge pull request #542 from algernon/f/hold-the-danceErez Zukerman
2016-07-24Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman
2016-07-24added music recording/playing docRobert Dale
2016-07-24ensure there's a recording to play before playing; also enables the LGUI butt...Robert Dale
2016-07-24Fix some errors in bepo mappingVivien Alger
2016-07-24Added LEADER_EXTERNS() call.Don Smith
2016-07-23Updated ReadmeJonathan Lucas
2016-07-23Did a derp and forgot to set Trans on Arrow layercommandlinedesign
2016-07-23Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen positioncommandlinedesign
2016-07-23Tested, resolved Mouse issue, resolved numpad issuecommandlinedesign