summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-07-25Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni97-434/+6778
2016-07-25Fixes midi functionalityJack Humbert5-17/+17
2016-07-25Merge pull request #554 from robertdale/music-recording-documentationJack Humbert1-0/+11
2016-07-25Merge pull request #552 from robertdale/music-play-fixJack Humbert1-1/+6
2016-07-25Merge pull request #550 from Darthabel/fix_bepoJack Humbert1-2/+2
2016-07-25Merge pull request #549 from locksmithdon/patch-1Jack Humbert1-0/+2
2016-07-25Merge pull request #548 from CommandLineDesign/CMD-PreonicJack Humbert3-0/+432
2016-07-25Merge pull request #546 from sethbc/satan-cleanupJack Humbert7-27/+57
2016-07-25Merge pull request #534 from willwm/teckinesisErez Zukerman11-0/+1820
2016-07-24Remove images, per @ezuk request. =)Will Wolff-Myren3-10/+0
2016-07-24Merge pull request #542 from algernon/f/hold-the-danceErez Zukerman3-96/+87
2016-07-24Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman9-214/+855
2016-07-24added music recording/playing docRobert Dale1-0/+11
2016-07-24ensure there's a recording to play before playing; also enables the LGUI butt...Robert Dale1-1/+6
2016-07-24Fix some errors in bepo mappingVivien Alger1-2/+2
2016-07-24Added LEADER_EXTERNS() call.Don Smith1-0/+2
2016-07-24Updated ReadmeJonathan Lucas1-1/+77
2016-07-24Did a derp and forgot to set Trans on Arrow layercommandlinedesign1-5/+5
2016-07-24Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen positioncommandlinedesign1-4/+4
2016-07-24Tested, resolved Mouse issue, resolved numpad issuecommandlinedesign1-15/+15
2016-07-24Resolved errorscommandlinedesign1-7/+17
2016-07-24Init ReadmeJonathan Lucas1-0/+1
2016-07-24Create MakefileJonathan Lucas1-0/+23
2016-07-24Create CMD-Preonic KeymapJonathan Lucas1-0/+322
2016-07-24Merge pull request #1 from jackhumbert/masterJonathan Lucas61-124/+3536
2016-07-24fix typo in readme and satan.hSeth Chandler2-2/+2
2016-07-24cleanup default layoutSeth Chandler3-15/+39
2016-07-24update sethbc keymapSeth Chandler2-10/+16
2016-07-22converted funtions to QMK aliasesToni1-32/+23
2016-07-22readme.md: Update the tap dance docsGergely Nagy1-12/+15
2016-07-22readme.md: algernon is strictly lowercaseGergely Nagy1-1/+1
2016-07-22tap-dance: Code cleanupGergely Nagy1-21/+24
2016-07-22tap-dance: Support user_data for the callbacksGergely Nagy2-64/+38
2016-07-22tap-dance: Support for holding keysGergely Nagy2-1/+12
2016-07-22more cosmetic changes (whitespace)Toni1-1/+1
2016-07-22purely cosmetic changesToni1-42/+42
2016-07-22Merge pull request #543 from VoodaGod/bone2planckJack Humbert1-74/+120
2016-07-22Merge pull request #541 from milestogo/masterJack Humbert29-0/+2816
2016-07-22Merge pull request #540 from replicaJunction/feature-atreus-keymapFunctionJack Humbert1-5/+5
2016-07-22Merge pull request #538 from robertdale/preonic-map-correctionJack Humbert1-5/+5
2016-07-22Merge pull request #536 from pvinis/debug-docJack Humbert1-1/+1
2016-07-22Merge pull request #530 from sethbc/masterJack Humbert10-8/+53
2016-07-22Merge pull request #529 from CommandLineDesign/CMD60-newKeymapJack Humbert6-0/+364
2016-07-22Merge pull request #525 from edasque/masterJack Humbert2-0/+43
2016-07-22Merge pull request #522 from exiva/extrakey-macfixJack Humbert1-2/+2
2016-07-22Merge pull request #521 from exiva/makefile-waitJack Humbert1-0/+4
2016-07-22Merge pull request #518 from jakllsch/upstreamJack Humbert8-13/+20
2016-07-22Merge pull request #516 from pvinis/tap-dance-anywayJack Humbert3-16/+103
2016-07-21adding traveller keyboardmilestogo7-0/+697
2016-07-20fixed include pathsJason Janse van Rensburg1-16/+16