summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-02-06
|\
| * Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert2017-02-06
| |\
| | * Add support for supplementary planes for OS XJonas Oberschweiber2016-12-31
* | | [skip build] testing travis scriptJack Humbert2017-02-06
|/ /
* | [skip build] testing travis scriptJack Humbert2017-02-06
* | Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert2017-02-06
|\ \
| * | registering a weak_mods when using register_code16SjB2017-01-29
| * | speeding up (un)register_code16SjB2017-01-23
* | | [skip build] testing travis scriptJack Humbert2017-02-06
* | | [skip build] testing travis scriptJack Humbert2017-02-06
* | | [skip build] testing travis scriptJack Humbert2017-02-06
* | | [skip build] testing travis scriptJack Humbert2017-02-06
* | | [skip build] testing travis scriptJack Humbert2017-02-06
* | | fixes qmk.fm linking, tests out auto version incrementingJack Humbert2017-02-06
* | | Merge pull request #1063 from osamuaoki/masterErez Zukerman2017-02-02
|\ \ \
| * | | Typo fixesOsamu Aoki2017-02-02
* | | | Merge pull request #1058 from edasque/masterErez Zukerman2017-02-02
|\ \ \ \ | |/ / / |/| | |
| * | | Reverted Dockerfile to put the CMD backErik Dasque2017-01-31
* | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2017-02-01
|\ \ \ \
| * | | | race condition between oneshot_mods and tap_danceSjB2017-01-29
* | | | | Merge pull request #1054 from deadcyclo/masterErez Zukerman2017-02-01
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-01
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-31
|\ \ \ \ \
| * | | | | albert ergodox keymapAlbert Pretorius2017-01-26
* | | | | | Merge pull request #1055 from matzebond/masterErez Zukerman2017-01-31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | update my neo2 keymapMatthias Schmitt2017-01-30
|/ / / / /
| | * | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-30
| | * | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-30
| | * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-30
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #1043 from potz/patch-1skullydazed2017-01-27
|\ \ \ \ \
| * | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-27
|/ / / / /
* | | | | Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-27
|\ \ \ \ \
| * | | | | Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-24
| | | * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-27
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | replace jackhumbert with qmkJack Humbert2017-01-26
|/ / / / /
| | * | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-27
| | * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-26
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-26
|\ \ \ \ \
| * | | | | updated all the other keymaps to support the new changes.SjB2017-01-24
| * | | | | fix: infinity60 keyboard was not using quantum features.SjB2017-01-23
| | |_|/ / | |/| | |
* | | | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-26
|\ \ \ \ \
| * | | | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-25
| * | | | | Update readme for smt Preonic keymapStephen Tudor2017-01-25
| * | | | | Add smt keymap for PreonicStephen Tudor2017-01-25
* | | | | | Add gitter image, start update to qmk orgJack Humbert2017-01-26
* | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-25
|\| | | | |
* | | | | | layer defines to enumJack Humbert2017-01-25
| |/ / / / |/| | | |
| | | * | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-25
| | | * | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-24
| | | |\ \ | | |_|/ / | |/| | |