Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-23 | 50 | -223/+2365 |
|\ | |||||
| * | Merge pull request #894 from dchagniot/ergodoxDvorakEmacs | Jack Humbert | 2016-11-21 | 2 | -0/+235 |
| |\ | |||||
| | * | typo fix | Didier Chagniot | 2016-11-20 | 2 | -19/+19 |
| | * | readme.md updated | Didier Chagniot | 2016-09-10 | 1 | -0/+70 |
| | * | typing with it | Didier Chagniot | 2016-09-09 | 1 | -0/+165 |
| * | | Merge pull request #893 from Sihui/sh-hhkb-jp | Jack Humbert | 2016-11-21 | 3 | -0/+147 |
| |\ \ | |||||
| | * | | add del to new cmd | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| | * | | add space to NewCmd layer | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| | * | | | add space to NewCmd layer | Sihui Huang | 2016-11-20 | 2 | -2/+2 |
| | |/ / | |||||
| | * | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+2 |
| | * | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+2 |
| | * | | add sh-hhkb-jp layers | Sihui Huang | 2016-11-20 | 3 | -0/+145 |
| * | | | Merge pull request #892 from fredizzimo/disable_ergodox_lcd | Jack Humbert | 2016-11-21 | 2 | -26/+5 |
| |\ \ \ | |||||
| | * | | | Always initialze the Infinity Ergodox backlight | Fred Sundvik | 2016-11-20 | 2 | -26/+5 |
| | |/ / | |||||
| * | | | Merge pull request #891 from g-sam/galson-keymap | Jack Humbert | 2016-11-21 | 3 | -0/+196 |
| |\ \ \ | |||||
| | * | | | adds galson keymap | samgalson@gmail.com | 2016-11-19 | 3 | -0/+196 |
| * | | | | Merge pull request #888 from climbalima/master | Jack Humbert | 2016-11-21 | 3 | -4/+12 |
| |\ \ \ \ | |||||
| | * | | | | changed readme | climbalima | 2016-11-19 | 2 | -2/+3 |
| | * | | | | added the pinout for pro micro into maxipad | climbalima | 2016-11-19 | 2 | -3/+10 |
| | |/ / / | |||||
| * | | | | Merge pull request #887 from profet23/atreus62 | Jack Humbert | 2016-11-21 | 8 | -0/+622 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Adding readme placeholder | Benjamin Grabkowitz | 2016-11-16 | 1 | -0/+10 |
| | * | | | Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62 | Benjamin Grabkowitz | 2016-11-16 | 7 | -0/+612 |
| * | | | | remove KC expansion from GH60 | Seth Chandler | 2016-11-19 | 4 | -99/+55 |
| * | | | | move KC expansion to separate macros | Seth Chandler | 2016-11-19 | 4 | -23/+66 |
| * | | | | merge upstream/master | Seth Chandler | 2016-11-19 | 45 | -252/+1949 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
| | * | | | should have fixed conflixed | climbalima | 2016-11-16 | 13 | -268/+10 |
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-11-16 | 20 | -123/+1189 |
| | |\ \ \ | |||||
| | | * | | | dvorak/plover keyboard layout | Seebs | 2016-11-16 | 2 | -0/+244 |
| | * | | | | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-16 | 14 | -29/+278 |
| | |\ \ \ \ | |||||
| | | * | | | | fixed conflict | climbalima | 2016-11-14 | 1 | -3/+0 |
| | | * | | | | fixed extra paste | climbalima | 2016-11-14 | 1 | -3/+2 |
| | | * | | | | Merge branch 'master' of https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-10 | 1 | -2/+19 |
| | | |\ \ \ \ | |||||
| | | | * | | | | returned to o | climbalima | 2016-11-10 | 1 | -4/+4 |
| | | * | | | | | Added both revisions into one folder | climbalima | 2016-11-10 | 11 | -101/+327 |
| | | |/ / / / | |||||
| | | * | | | | Changes to be committed: | climbalima | 2016-11-10 | 29 | -68/+2119 |
| | * | | | | | Updated my repo to current qmk | climbalima | 2016-11-16 | 25 | -98/+756 |
| | | |_|/ / | | |/| | | | |||||
| * / | | | | add sethbc keymap for gh60 and update macro expansion in connection with same | Seth Chandler | 2016-11-13 | 3 | -15/+96 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-16 | 18 | -123/+945 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #880 from psyill/master | Jack Humbert | 2016-11-16 | 6 | -0/+678 |
| |\ \ \ \ | |||||
| | * | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | Hans EllegÄrd | 2016-11-13 | 6 | -0/+678 |
| | |/ / / | |||||
| * | | | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap | Jack Humbert | 2016-11-16 | 3 | -13/+3 |
| |\ \ \ \ | |||||
| | * | | | | update sethbc ergodox keymap | Seth Chandler | 2016-11-13 | 3 | -13/+3 |
| | |/ / / | |||||
| * | | | | Merge pull request #877 from sethbc/update_sethbc_satan_keymap | Jack Humbert | 2016-11-16 | 1 | -7/+7 |
| |\ \ \ \ | |||||
| | * | | | | oops, fixed inverted if statement | Seth Chandler | 2016-11-13 | 1 | -6/+6 |
| | * | | | | update sethbc keymap | Seth Chandler | 2016-11-12 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #876 from Dbroqua/master | Jack Humbert | 2016-11-16 | 3 | -1/+120 |
| |\ \ \ \ | |||||
| | * | | | | Merge pull request #12 from jackhumbert/master | Damien | 2016-11-12 | 1 | -3/+3 |
| | |\| | | | |||||
| | * | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-11-12 | 15 | -538/+1231 |
| | |\ \ \ \ |