Commit Graph

2676 Commits (2d59c97ec16914835c55a409b460ecc79eba152d)
 

Author SHA1 Message Date
Christopher Browne 2d59c97ec1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
Jack Humbert 80667e898a Merge pull request #572 from algernon/f/tap-dance-debug
8 years ago
Jack Humbert e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build
8 years ago
Jack Humbert a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings
8 years ago
Jack Humbert 36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
8 years ago
Jack Humbert f96a2a74ea Merge pull request #566 from SmackleFunky/master
8 years ago
Jack Humbert 9171ce1d17 Merge pull request #559 from Talljoe/fix-compiler-warning
8 years ago
Jack Humbert 8d98f37fbb Merge pull request #564 from mazinbokhari/master
8 years ago
Christopher Browne 911d0a040e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
Gergely Nagy b21e8b97ac tap-dance: Add some debugging support
8 years ago
Seth Chandler 180a3da44d remove unnecessary includes
8 years ago
Seth Chandler 95ef3f864e fix numerous errors in bone2planck keymap
8 years ago
Seth Chandler 368d0bdf68 kill warnings filling up travis buildlog
8 years ago
Seth Chandler 13bb3a7379 update NO_AMP to NO_AMPR
8 years ago
SmackleFunky fdd07991de Allow toggling out of plover layer
8 years ago
Mazin Bokhari 3fd1c9d72b Move to keyboards
8 years ago
Erez Zukerman 93f366fa7d Merge pull request #562 from michaelklos/doc
8 years ago
Erez Zukerman 685c8ba64c Merge pull request #533 from mazinbokhari/master
8 years ago
Michael Klos 7e69de061a Added Tap Dance Example
8 years ago
Christopher Browne 2a349e96bb Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
Jack Humbert b66131eeb5 disable midi by default
8 years ago
erlo muvman 26510e6de8 Delete default.png
8 years ago
erlo muvman 3779e1988e Delete default_highres.png
8 years ago
erlo muvman 97efac0f1c Update readme.md
8 years ago
erlo muvman 6e2d7ebd80 Update readme.md
8 years ago
erlo muvman 048e8b7849 Update readme.md
8 years ago
Christopher Browne 17a7570e08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
Jack Humbert f9aadd17e8 Merge pull request #558 from lindhe/master
8 years ago
Andreas Lindhé 283ebbe142 Change Nordic ampersand code to match the English
8 years ago
Andreas Lindhé b6fa762234 Fix misspelled command in Norwegian helper
8 years ago
Jack Humbert 8b94e26d7c Fixes midi functionality
8 years ago
Jack Humbert 4aa7d2e206 Merge pull request #554 from robertdale/music-recording-documentation
8 years ago
Jack Humbert 24bd931962 Merge pull request #552 from robertdale/music-play-fix
8 years ago
Jack Humbert 41f15d8c34 Merge pull request #550 from Darthabel/fix_bepo
8 years ago
Jack Humbert 46f84157ce Merge pull request #549 from locksmithdon/patch-1
8 years ago
Jack Humbert 670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic
8 years ago
Jack Humbert 384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup
8 years ago
Erez Zukerman 4885225159 Merge pull request #534 from willwm/teckinesis
8 years ago
Will Wolff-Myren f4cb84c940 Remove images, per @ezuk request. =)
8 years ago
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
8 years ago
Erez Zukerman 1e944a4991 Merge pull request #542 from algernon/f/hold-the-dance
8 years ago
Erez Zukerman 36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon
8 years ago
Robert Dale 812007a241 added music recording/playing doc
8 years ago
Robert Dale 3ea738e450 ensure there's a recording to play before playing; also enables the LGUI button to play a tone
8 years ago
Vivien Alger 7b4d30ee50 Fix some errors in bepo mapping
8 years ago
Don Smith a4034b75c0 Added LEADER_EXTERNS() call.
8 years ago
Jonathan Lucas e6a41e43aa Updated Readme
8 years ago
commandlinedesign c826bcfc39 Did a derp and forgot to set Trans on Arrow layer
8 years ago
commandlinedesign 4480a74a4b Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position
8 years ago
commandlinedesign c1fb82623c Tested, resolved Mouse issue, resolved numpad issue
8 years ago