summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-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-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-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
2017-01-26Add gitter image, start update to qmk orgJack Humbert
2017-01-25Remove COLEMAK from preonic_keycodes enumStephen Tudor
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2017-01-25layer defines to enumJack Humbert
2017-01-25[deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee
2017-01-25Update readme for smt Preonic keymapStephen Tudor
2017-01-25Add smt keymap for PreonicStephen Tudor
2017-01-24Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-24[deadcyclo layout] Added unicode layerBrendan Johan Lee
2017-01-24[deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee
2017-01-24Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert
2017-01-24updated all the other keymaps to support the new changes.SjB
2017-01-23fix: infinity60 keyboard was not using quantum features.SjB
2017-01-24Compare Makefile with itself instead of using `--help`Dylan Scott
2017-01-23turn off rgb_midi in ezJack Humbert
2017-01-23Merge pull request #1026 from TerryMathews/masterJack Humbert
2017-01-22More code cleanupTerryMathews
2017-01-22Merge pull request #1018 from hot-leaf-juice/masterJack Humbert
2017-01-22More keyboard map tweaking (#1019)Christopher Browne
2017-01-22Merge pull request #1020 from remigius42/masterJack Humbert
2017-01-22Merge pull request #1022 from lucwastiaux/masterJack Humbert
2017-01-22Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert
2017-01-22Merge pull request #1023 from TerryMathews/masterJack Humbert
2017-01-22Missed commenting out notes at end of lineTerryMathews
2017-01-22Fixed keymap matrix on rev2TerryMathews