summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-02-06Merge pull request #1048 from smt/smt/planckJack Humbert
2017-02-06Merge pull request #1059 from qmk/hf/algr_tJack Humbert
2017-02-06Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert
2017-02-06Merge pull request #960 from ofples/feature/combosJack Humbert
2017-02-06Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert
2017-02-06Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert
2017-02-02Merge pull request #1063 from osamuaoki/masterErez Zukerman
2017-02-02Merge pull request #1058 from edasque/masterErez Zukerman
2017-02-02Typo fixesOsamu Aoki
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman
2017-02-01Merge pull request #1054 from deadcyclo/masterErez Zukerman
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-31Introduces ALGR_T for dual-function AltGrErez Zukerman
2017-01-31Reverted Dockerfile to put the CMD backErik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
2017-01-31Merge pull request #1055 from matzebond/masterErez Zukerman
2017-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-29race condition between oneshot_mods and tap_danceSjB
2017-01-29moved oneshot cancellation code outside of process_record.SjB
2017-01-29registering a weak_mods when using register_code16SjB
2017-01-28s/Bkps/BkspStephen Tudor
2017-01-28Carry over Planck updates to my Preonic keymapStephen Tudor
2017-01-28Improve Planck keymapStephen Tudor
2017-01-28Merge branch 'master' into smt/planckStephen Tudor
2017-01-27Merge pull request #1043 from potz/patch-1skullydazed
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert
2017-01-26albert ergodox keymapAlbert Pretorius
2017-01-26Update readmeNic Aitch
2017-01-26Add avrdude targetNic Aitch
2017-01-26Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-26replace jackhumbert with qmkJack Humbert
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert