aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2017-02-06Merge pull request #1048 from smt/smt/planckGravatar Jack Humbert
2017-02-06Merge pull request #1059 from qmk/hf/algr_tGravatar Jack Humbert
2017-02-06Merge pull request #1036 from nicinabox/lets-split-improvementsGravatar Jack Humbert
2017-02-06Merge pull request #960 from ofples/feature/combosGravatar Jack Humbert
2017-02-06Merge pull request #1010 from SjB/oneshot_timeout_fixGravatar Jack Humbert
2017-02-06Merge branch 'master' of github.com:jackhumbert/qmk_firmwareGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Gravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06[skip build] testing travis scriptGravatar Jack Humbert
2017-02-06fixes qmk.fm linking, tests out auto version incrementingGravatar Jack Humbert
2017-02-02Merge pull request #1063 from osamuaoki/masterGravatar Erez Zukerman
2017-02-02Merge pull request #1058 from edasque/masterGravatar Erez Zukerman
2017-02-02Typo fixesGravatar Osamu Aoki
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsGravatar Erez Zukerman
2017-02-01Merge pull request #1054 from deadcyclo/masterGravatar Erez Zukerman
2017-02-01Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-31Introduces ALGR_T for dual-function AltGrGravatar Erez Zukerman
2017-01-31Reverted Dockerfile to put the CMD backGravatar Erik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapGravatar Erez Zukerman
2017-01-31Merge pull request #1055 from matzebond/masterGravatar Erez Zukerman
2017-01-30update my neo2 keymapGravatar Matthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosGravatar Brendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsGravatar Brendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-29race condition between oneshot_mods and tap_danceGravatar SjB
2017-01-29moved oneshot cancellation code outside of process_record.Gravatar SjB
2017-01-29registering a weak_mods when using register_code16Gravatar SjB
2017-01-28s/Bkps/BkspGravatar Stephen Tudor
2017-01-28Carry over Planck updates to my Preonic keymapGravatar Stephen Tudor
2017-01-28Improve Planck keymapGravatar Stephen Tudor
2017-01-28Merge branch 'master' into smt/planckGravatar Stephen Tudor
2017-01-27Merge pull request #1043 from potz/patch-1Gravatar skullydazed
2017-01-27Clarify license on abnt2 keymap (#1038)Gravatar Potiguar Faga
2017-01-27Merge pull request #869 from dylanjgscott/masterGravatar Jack Humbert
2017-01-27Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysGravatar Brendan Johan Lee
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesGravatar Jack Humbert
2017-01-26albert ergodox keymapGravatar Albert Pretorius
2017-01-26Update readmeGravatar Nic Aitch
2017-01-26Add avrdude targetGravatar Nic Aitch
2017-01-26Merge remote-tracking branch 'upstream/master'Gravatar Brendan Johan Lee
2017-01-26replace jackhumbert with qmkGravatar Jack Humbert
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Gravatar Jack Humbert
2017-01-26Merge pull request #1033 from smt/smt/preonicGravatar Jack Humbert