Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1144 from milestogo/sculpt2 | Jack Humbert | 2017-03-15 | 17 | -0/+1498 |
|\ | |||||
| * | Merge branch 'master' into sculpt2 | milestogo | 2017-03-08 | 172 | -2243/+6603 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-03-08 | 140 | -1986/+5122 |
| | |\ | |||||
| | * \ | : | milestogo | 2017-02-12 | 11 | -62/+444 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-11 | 32 | -365/+1207 |
| | |\ \ \ | |||||
| * | | | | | docs for babblepaste | milestogo | 2017-03-08 | 2 | -481/+115 |
| * | | | | | fix stupid error w/ mode switch | milestogo | 2017-03-08 | 8 | -25/+51 |
| * | | | | | added browser babble, removed code from keymap | milestogo | 2017-03-08 | 4 | -212/+438 |
| * | | | | | working with preprocessor macros for babblepaste | milestogo | 2017-03-06 | 5 | -431/+395 |
| * | | | | | clean up babblepaste | milestogo | 2017-02-28 | 3 | -0/+1029 |
| * | | | | | missed config.h stuck modifiers change | milestogo | 2017-02-28 | 1 | -2/+4 |
| * | | | | | keymap and C6 audio testing | milestogo | 2017-02-28 | 3 | -28/+125 |
| * | | | | | keymap update | milestogo | 2017-02-11 | 2 | -12/+24 |
| * | | | | | Merge branch 'master' into sculpt2 | milestogo | 2017-02-09 | 81 | -304/+2839 |
| |\| | | | | |||||
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-09 | 81 | -304/+2839 |
| | |\ \ \ \ | |||||
| * | | | | | | dumber sculpt build | milestogo | 2017-02-09 | 14 | -0/+508 |
| |/ / / / / | |||||
* | | | | | | update for infinity | Jack Humbert | 2017-03-15 | 1 | -1/+1 |
* | | | | | | Update readme.md | Jack Humbert | 2017-03-13 | 1 | -1/+1 |
* | | | | | | Merge pull request #1154 from dennistruemper/neo2_on_qwerz_hardware | Erez Zukerman | 2017-03-12 | 2 | -0/+602 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove typo from folder name | Dennis Trümper | 2017-03-11 | 2 | -0/+0 |
| * | | | | | | update documentation | Dennis Trümper | 2017-03-11 | 2 | -79/+86 |
| * | | | | | | change layer 3 on right thumb back to layer 1 | Dennis Trümper | 2017-03-11 | 1 | -2/+2 |
| * | | | | | | working but some documentation needed | Dennis Trümper | 2017-03-11 | 2 | -0/+595 |
|/ / / / / / | |||||
* | | | | / | Tweaks keymap to reset on boot | Erez Zukerman | 2017-03-08 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1137 from Skrymir/patch-1 | Jack Humbert | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed minor error in ergodox infinity section. | Joshua Colbeck | 2017-03-07 | 1 | -1/+1 |
* | | | | | | Merge pull request #1138 from nooges/magicforce68 | Jack Humbert | 2017-03-08 | 8 | -0/+363 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix function layer actions | Danny Nguyen | 2017-03-07 | 1 | -9/+4 |
| * | | | | | | Add Makefile | Danny Nguyen | 2017-03-07 | 1 | -0/+3 |
| * | | | | | | Update description | Danny Nguyen | 2017-03-07 | 1 | -1/+1 |
| * | | | | | | Add readme file | Danny Nguyen | 2017-03-07 | 2 | -27/+12 |
| * | | | | | | Set pinout and layout | Danny Nguyen | 2017-03-07 | 3 | -55/+61 |
| * | | | | | | Add rule for flashing microcontroller using avrdude | Danny Nguyen | 2017-03-07 | 1 | -0/+10 |
| * | | | | | | Copy CMD60 as starting point and rename files | Danny Nguyen | 2017-03-07 | 6 | -0/+364 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1140 from stites/freebsd | Jack Humbert | 2017-03-08 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add freebsd support in "util/install_dependencies.sh" | stites | 2017-03-07 | 1 | -0/+19 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1142 from guni77/my_keymap | Jack Humbert | 2017-03-08 | 2 | -0/+310 |
|\ \ \ \ \ \ | |||||
| * | | | | | | added readme file | Gunther Gruber | 2017-03-08 | 1 | -0/+133 |
| * | | | | | | small changes in guni.c keymap to work with new qmk_firmware packet | Gunther Gruber | 2017-02-27 | 1 | -2/+3 |
| * | | | | | | guni keymap | Gunther Gruber | 2017-02-27 | 1 | -0/+176 |
* | | | | | | | Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukas | Jack Humbert | 2017-03-08 | 3 | -0/+250 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | readme | Lukas Stiebig | 2017-03-08 | 1 | -0/+12 |
| * | | | | | | Corrected the description of the layer | Lukas Stiebig | 2017-03-08 | 1 | -1/+2 |
| * | | | | | | Added german-lukas | Lukas Stiebig | 2017-03-08 | 1 | -0/+235 |
| * | | | | | | Left control and alt | Lukas Stiebig | 2017-03-08 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1107 from qmk/clueboard_cleanup | skullydazed | 2017-03-04 | 31 | -257/+763 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add the mouse_keys layout | skullY | 2017-02-16 | 2 | -0/+11 |
| * | | | | | | Rework the clueboard keymaps a bit. | skullY | 2017-02-16 | 30 | -257/+752 |
* | | | | | | | Merge pull request #1126 from folkert4/master | Jack Humbert | 2017-03-03 | 4 | -70/+95 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Various QOL changes: | folkert4 | 2017-02-28 | 4 | -70/+95 |