Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update readme.md | Xyverz | 2016-09-17 | 1 | -1/+1 |
* | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-09-16 | 3 | -6/+9 |
|\ | |||||
| * | Merge pull request #758 from absenth/development | Erez Zukerman | 2016-09-14 | 3 | -6/+9 |
| |\ | |||||
| | * | Adding Space Cadet, And Correcting Ascii Keymap | Lars R. Noldan | 2016-09-14 | 3 | -6/+9 |
* | | | removed a couple of mod_tap keys since they had some unintended conseqeunces ... | xyverz | 2016-09-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #734 from adiabatic/master | Erez Zukerman | 2016-09-11 | 3 | -10/+12 |
|\ \ | |||||
| * | | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃ | Nathan Sharfi | 2016-09-07 | 2 | -10/+12 |
| * | | zweihander: rename to Makefile | Nathan Sharfi | 2016-09-07 | 1 | -0/+0 |
* | | | Merge pull request #740 from absenth/development | Erez Zukerman | 2016-09-11 | 3 | -0/+191 |
|\ \ \ | | |/ | |/| | |||||
| * | | Updated Image Header | Lars | 2016-09-08 | 1 | -0/+0 |
| * | | first commit of Absenth's Ergodox Firmware | Lars | 2016-09-08 | 3 | -0/+191 |
* | | | Merge pull request #746 from DidierLoiseau/bépo | Erez Zukerman | 2016-09-11 | 2 | -0/+689 |
|\ \ \ | |||||
| * | | | Added readme.md for bepo_csa | Didier Loiseau | 2016-09-11 | 1 | -0/+162 |
| * | | | Fixed compilation issues after the merge | Didier Loiseau | 2016-09-11 | 1 | -0/+527 |
* | | | | Merge pull request #743 from shelaf/patch-2 | Jack Humbert | 2016-09-11 | 3 | -16/+12 |
|\ \ \ \ | |||||
| * | | | | Variables in Makefile are ignored in rules.mk | shela | 2016-09-11 | 3 | -6/+2 |
| * | | | | fix variable value of rules.mk | shela | 2016-09-11 | 1 | -10/+10 |
| |/ / / | |||||
* | | | | Add PCBDOWN | Daniel Bordak | 2016-09-10 | 1 | -0/+4 |
* | | | | Update to new default keymap | Daniel Bordak | 2016-09-10 | 2 | -5/+65 |
* | | | | Fix typo | Daniel Bordak | 2016-09-10 | 1 | -3/+3 |
|/ / / | |||||
* | | | 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 #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 | 45 | -797/+2748 |
| |\| | | |||||
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-29 | 139 | -5814/+6444 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-26 | 50 | -288/+2915 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-24 | 18 | -5/+1081 |
| |\ \ \ \ \ | |||||
| * | | | | | | More notes | cbbrowne | 2016-08-24 | 1 | -3/+4 |
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-22 | 98 | -606/+8317 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-15 | 51 | -1245/+3312 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-12 | 8 | -0/+467 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 | 4 | -206/+187 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-08-04 | 247 | -1869/+4634 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-28 | 6 | -23/+366 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | 77 | -329/+6522 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | 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 | 2 | -0/+213 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-07-12 | 45 | -663/+1107 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra cases | Christopher Browne | 2016-07-12 | 1 | -1/+1 |