summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-07Merge pull request #1059 from qmk/hf/algr_tJack Humbert1-0/+1
2017-02-07Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert2-0/+14
2017-02-07Merge pull request #960 from ofples/feature/combosJack Humbert5-0/+194
2017-02-07Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert1-8/+8
2017-02-07Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert1-1/+10
2017-02-07[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-07Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert1-1/+10
2017-02-06[skip build] testing travis scriptJack Humbert2-1/+3
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert1-2/+30
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+5
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-3/+1
2017-02-06[skip build] testing travis scriptJack Humbert2-19/+25
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert1-1/+20
2017-02-03Merge pull request #1063 from osamuaoki/masterErez Zukerman1-18/+18
2017-02-03Merge pull request #1058 from edasque/masterErez Zukerman1-1/+2
2017-02-02Typo fixesOsamu Aoki1-18/+18
2017-02-02Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2-1/+7
2017-02-02Merge pull request #1054 from deadcyclo/masterErez Zukerman7-103/+384
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01Introduces ALGR_T for dual-function AltGrErez Zukerman1-0/+1
2017-02-01Reverted Dockerfile to put the CMD backErik Dasque1-1/+2
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
2017-02-01Merge pull request #1055 from matzebond/masterErez Zukerman1-30/+34
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2-2/+18
2017-01-29race condition between oneshot_mods and tap_danceSjB2-1/+7
2017-01-29moved oneshot cancellation code outside of process_record.SjB1-8/+8
2017-01-29registering a weak_mods when using register_code16SjB1-4/+24
2017-01-28Merge pull request #1043 from potz/patch-1skullydazed1-0/+16
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga1-0/+16
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert1-2/+2
2017-01-27Merge remote-tracking branch 'upstream/master'Brendan Johan Lee16-22/+22
2017-01-27[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee4-23/+26
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert16-22/+22
2017-01-26albert ergodox keymapAlbert Pretorius4-0/+866
2017-01-26Update readmeNic Aitch1-0/+4
2017-01-26Add avrdude targetNic Aitch1-0/+10
2017-01-26Merge remote-tracking branch 'upstream/master'Brendan Johan Lee11-16/+403
2017-01-26replace jackhumbert with qmkJack Humbert16-22/+22
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert5-0/+46
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert3-0/+335
2017-01-26Add gitter image, start update to qmk orgJack Humbert1-3/+3
2017-01-25Remove COLEMAK from preonic_keycodes enumStephen Tudor1-1/+0
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert3-3/+66
2017-01-25layer defines to enumJack Humbert2-13/+19
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee3-11/+178
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-10-03 05:26:44 +0200