summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-02-07pass through travis errorsJack Humbert3-2/+6
2017-02-07Merge pull request #1056 from upils/masterJack Humbert8-0/+334
2017-02-07Merge pull request #1053 from TerryMathews/masterJack Humbert10-4/+175
2017-02-07variable scope fix for travisJack Humbert2-5/+3
2017-02-07correctly assign bash variableJack Humbert2-3/+3
2017-02-07fix typoJack Humbert1-1/+1
2017-02-07add commaJack Humbert1-1/+1
2017-02-07Merge pull request #1069 from hot-leaf-juice/masterJack Humbert2-5/+3
2017-02-07try building only keyboards neededJack Humbert3-7/+23
2017-02-07Merge pull request #1041 from folkert4/masterJack Humbert5-0/+503
2017-02-07Merge pull request #1047 from lordchair/keymap_yaleJack Humbert4-0/+144
2017-02-07Merge pull request #1048 from smt/smt/planckJack Humbert5-22/+385
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-07Reverse rev2 and rev2fliphalfTerryMathews2-8/+8
2017-02-07Revert "Reverse rev2 and rev2fliphalf"TerryMathews2-7/+7
2017-02-07Reverse rev2 and rev2fliphalfTerryMathews2-7/+7
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-06change cmd-l and cmd-r for actual home and endCallum Oakley2-5/+3
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-31Add reddot handwired keyboard.upils8-0/+334
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-30Let's Split: establish rev2fliphalf subprojectTerryMathews9-0/+171
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