Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware | Stephan Bösebeck | 2016-04-02 | 84 | -2017/+4991 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-04-01 | 81 | -1909/+4883 |
| |\ | |||||
| | * | Merge pull request #233 from tak3over/patch-1 | Jack Humbert | 2016-04-01 | 1 | -0/+136 |
| | |\ | |||||
| | | * | Create tak3over.c | tak3over | 2016-04-01 | 1 | -0/+136 |
| | |/ | |||||
| | * | adding files is always smart | Jack Humbert | 2016-04-01 | 7 | -0/+327 |
| | * | Merge pull request #226 from squisher/dvorak_intl_squisher | Erez Zukerman | 2016-04-01 | 6 | -0/+1341 |
| | |\ | |||||
| | | * | Also add compiled hex file | David Mohr | 2016-03-30 | 1 | -0/+1127 |
| | | * | Squisher's international dvorak variant for ergodox ez | David Mohr | 2016-03-30 | 5 | -0/+214 |
| | * | | Merge pull request #230 from IBNobody/master | Jack Humbert | 2016-03-31 | 1 | -11/+68 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Drastically rewrote the path script to handle Explorer's stubborn grasp of En... | IBNobody | 2016-03-30 | 1 | -11/+68 |
| | |/ | |||||
| | * | Merge pull request #229 from NoahAndrews/patch-5 | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Update README.md | Noah Andrews | 2016-03-30 | 1 | -2/+2 |
| | |/ | |||||
| | * | Merge pull request #227 from NoahAndrews/patch-4 | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Fixed minor issues with Preonic readme | Noah Andrews | 2016-03-30 | 1 | -2/+2 |
| | * | | Merge pull request #228 from mrfoto/fix-planck-diagram | Jack Humbert | 2016-03-30 | 1 | -2/+2 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Tiny fix of Planck diagrams | Miha Rekar | 2016-03-30 | 1 | -2/+2 |
| | |/ | |||||
| | * | preonic readme | Jack Humbert | 2016-03-30 | 1 | -9/+3 |
| | * | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard | Jack Humbert | 2016-03-30 | 179 | -41877/+39434 |
| | |\ | |||||
| | | * | Merge pull request #224 from NoahAndrews/make-keymap-names-consistent | Jack Humbert | 2016-03-29 | 41 | -42/+45 |
| | | |\ | |||||
| | | | * | Updated several keyboard folders to use new keymap naming scheme | Noah Andrews | 2016-03-29 | 41 | -42/+45 |
| | | | * | Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-cons... | Noah Andrews | 2016-03-29 | 147 | -40692/+40208 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | Merge pull request #223 from NoahAndrews/patch-3 | Jack Humbert | 2016-03-29 | 1 | -4/+9 |
| | | |\ \ | |||||
| | | | * | | Fix #198 | Noah Andrews | 2016-03-29 | 1 | -4/+9 |
| | | |/ / | |||||
| | | * | | Merge pull request #222 from NoahAndrews/patch-2 | Jack Humbert | 2016-03-29 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Fix error in Planck makefile comment | Noah Andrews | 2016-03-29 | 1 | -1/+1 |
| | | |/ / | |||||
| | * | | | .hex files | Jack Humbert | 2016-03-30 | 3 | -2/+2893 |
| | * | | | preonic update | Jack Humbert | 2016-03-30 | 20 | -1846/+66 |
| * | | | | minor tweaks at the keymap, new png for documentation | Stephan Bösebeck | 2016-04-01 | 2 | -6/+6 |
| * | | | | fixed de_osx prefix in keymap include to avoid conflicts | Stephan Bösebeck | 2016-03-31 | 2 | -103/+103 |
* | | | | | new keymap | Stephan Bösebeck | 2016-04-02 | 1 | -1/+9 |
|/ / / / | |||||
* | | | | added CTL_Shift / Hash macro | Stephan Bösebeck | 2016-03-29 | 1 | -11/+24 |
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-29 | 5 | -18/+55 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #219 from IBNobody/master | Jack Humbert | 2016-03-28 | 4 | -13/+48 |
| |\ \ \ | |||||
| | * | | | Minor Tweaks and Documentation | IBNobody | 2016-03-28 | 3 | -12/+44 |
| | * | | | Added command to turn LED indicators off while sleeping | IBNobody | 2016-03-28 | 1 | -1/+4 |
| * | | | | Merge pull request #220 from NoahAndrews/improve-buildguide | Jack Humbert | 2016-03-28 | 1 | -5/+7 |
| |\ \ \ \ | |||||
| | * | | | | Added clarifying steps to Windows section of build guide | Noah Andrews | 2016-03-28 | 1 | -5/+7 |
| | * | | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide | Noah Andrews | 2016-03-28 | 144 | -40683/+40157 |
| | |\ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-28 | 37 | -1306/+4820 |
|\| | | | | |||||
| * | | | | Merge pull request #216 from msc654/master | Erez Zukerman | 2016-03-28 | 6 | -0/+1334 |
| |\ \ \ \ | |||||
| | * | | | | Corrected duplicate image issue | Matthew Carroll | 2016-03-28 | 1 | -0/+0 |
| | * | | | | Added msc keymap for ergodox_ez | Matthew Carroll | 2016-03-27 | 6 | -0/+1334 |
| * | | | | | Merge pull request #214 from cdlm/action-hook | Jack Humbert | 2016-03-28 | 6 | -21/+45 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add action-preprocessing kb/user hooks in planck | Damien Pollet | 2016-03-28 | 2 | -15/+18 |
| | * | | | | | Add action-preprocessing hook to keyboard template | Damien Pollet | 2016-03-28 | 2 | -6/+19 |
| | * | | | | | Rename function to be keyboard-specific | Damien Pollet | 2016-03-28 | 2 | -4/+4 |
| | * | | | | | Add per-event user hook function to QMK | Damien Pollet | 2016-03-28 | 2 | -0/+8 |
| * | | | | | | Merge pull request #217 from IBNobody/master | Jack Humbert | 2016-03-28 | 7 | -132/+488 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Magic Key Overrides / Keyboard Lock / Forced NKRO | IBNobody | 2016-03-28 | 7 | -132/+488 |
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-03-27 | 18 | -1150/+2950 |
| | |\| | | | |