Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix variable value of rules.mk | shela | 2016-09-11 | 1 | -10/+10 |
* | Merge pull request #715 from profet23/master | Jack Humbert | 2016-09-09 | 4 | -0/+234 |
|\ | |||||
| * | Changing keymap name to "profet_80" | profet23 | 2016-09-08 | 3 | -0/+0 |
| * | Removing separate ergodox80 project. | profet23 | 2016-09-06 | 21 | -1930/+55 |
| * | Removing/editing non applicable readme | profet23 | 2016-09-02 | 4 | -171/+2 |
| * | Adding 80 Key Ergodox Support | profet23 | 2016-09-02 | 21 | -0/+2278 |
* | | Merge pull request #739 from pondrejk/master | Jack Humbert | 2016-09-08 | 1 | -0/+0 |
|\ \ | |||||
| * | | util/install_dependencies.sh made executable, fixes #738 | Peter Ondrejka | 2016-09-08 | 1 | -0/+0 |
* | | | Merge pull request #737 from pondrejk/patch-1 | Jack Humbert | 2016-09-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fixed typo in Linux install instructions | Peter Ondrejka | 2016-09-08 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #736 from tong92/master | Jack Humbert | 2016-09-08 | 3 | -0/+274 |
|\ \ \ | |||||
| * | | | add tong92 keymap | tong92 | 2016-09-08 | 3 | -0/+274 |
| |/ / | |||||
* | | | Merge pull request #735 from romanzolotarev/patch-1 | Jack Humbert | 2016-09-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo | Roman Zolotarev | 2016-09-08 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #733 from cbbrowne/master | Jack Humbert | 2016-09-08 | 3 | -15/+38 |
|\ \ \ | |||||
| * | | | Borrowed joint Shift/Enter idea from sgoodwin mapping | cbbrowne | 2016-09-07 | 2 | -1/+2 |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-09-07 | 51 | -823/+2846 |
| |\| | | |||||
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 191 | -10220/+11500 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-26 | 52 | -290/+2926 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-24 | 32 | -13/+1526 |
| |\ \ \ \ \ | |||||
| * | | | | | | More notes | cbbrowne | 2016-08-24 | 1 | -3/+4 |
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-22 | 132 | -2857/+11027 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-15 | 4 | -30/+221 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-15 | 55 | -1259/+3328 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-12 | 10 | -2/+469 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-10 | 7 | -4/+775 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-09 | 15 | -14/+585 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-08 | 7 | -208/+273 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-04 | 264 | -2318/+5419 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-28 | 9 | -24/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-27 | 3 | -1/+376 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-26 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-25 | 98 | -436/+6780 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Notes about changes | Christopher Browne | 2016-07-18 | 1 | -8/+8 |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-15 | 4 | -10/+229 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-12 | 56 | -747/+1343 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra cases | Christopher Browne | 2016-07-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-07 | 145 | -183/+9398 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-04 | 115 | -502/+10955 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-30 | 80 | -1058/+1783 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-28 | 12 | -182/+308 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-24 | 248 | -139888/+2567 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-23 | 9 | -0/+1507 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFT | Christopher Browne | 2016-06-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 559 | -17239/+3753 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-21 | 63 | -23942/+23799 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More notes | Christopher Browne | 2016-06-21 | 2 | -0/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve docs a bit | Christopher Browne | 2016-06-21 | 2 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filler to make layering clearer; | Christopher Browne | 2016-06-21 | 2 | -7/+10 |