summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into coderkun_neo2coderkun2016-10-0253-1125/+3453
|\
| * Merge pull request #788 from chwilk/kastyle-refreshErez Zukerman2016-09-304-36/+80
| |\
| | * Added description of kastyle keymapchwilk2016-09-271-0/+14
| | * Moved hand_swap_config array so all keyboards get it definedchwilk2016-09-262-21/+24
| | * Updated kastyle keymap, including swap hands featurechwilk2016-09-261-36/+62
| | * Added ONEHAND_ENABLE to allow SWAP HANDS actionschwilk2016-09-261-0/+1
| * | Remove config.hChris McLennon2016-09-281-93/+0
| * | Contributing new keymap to ErgodoxChris McLennon2016-09-283-0/+242
| |/
| * Disables sleep LED by defaultErez Zukerman2016-09-231-0/+2
| * Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
| |\
| | * Update the ergodox/algernon keymap to v1.7Gergely Nagy2016-09-1813-475/+616
| * | Adds EPRM reset keyErez Zukerman2016-09-222-2/+12
| |/
| * Merge pull request #758 from absenth/developmentErez Zukerman2016-09-143-6/+9
| |\
| | * Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan2016-09-143-6/+9
| * | Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
| |\ \
| | * | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| | * | zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
| * | | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
| |\ \ \ | | | |/ | | |/|
| | * | Updated Image HeaderLars2016-09-081-0/+0
| | * | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
| * | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
| * | | Fixed compilation issues after the mergeDidier Loiseau2016-09-111-0/+527
| * | | Merge pull request #715 from profet23/masterJack Humbert2016-09-094-0/+234
| |\ \ \ | | |/ / | |/| |
| | * | Changing keymap name to "profet_80"profet232016-09-083-0/+0
| | * | Removing separate ergodox80 project.profet232016-09-064-0/+234
| * | | Fix typoRoman Zolotarev2016-09-081-1/+1
| | |/ | |/|
| * | Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
| |\ \
| | * | Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| * | | norwegian programmer-friendly layoutjoar2016-09-066-0/+420
| |/ /
| * | Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
| |\ \
| | * | Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| | * | Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| | |/
| * | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
| |\ \
| * \ \ Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
| |\ \ \ | | |_|/ | |/| |
| | * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| * | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-261-23/+142
| |\ \ \
| | * \ \ Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman2016-08-261-23/+144
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Making the existing firmware link betterSean Reifschneider2016-08-241-1/+2
| | | * | Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider2016-08-241-0/+34
| | | * | Changes from review by @fredizzimo and @XyverzSean Reifschneider2016-08-221-19/+16
| | | * | Tweaks after review.Sean Reifschneider2016-08-191-3/+3
| | | * | Restructuring of the ergodox README.Sean Reifschneider2016-08-191-29/+105
| | | * | Noting the change directory.Sean Reifschneider2016-08-191-0/+1
| | | * | Adding submodule note.Sean Reifschneider2016-08-191-0/+1
| | | * | Adding nicer Infinity build instructions.Sean Reifschneider2016-08-191-0/+11
| * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-243-0/+419
| |\| | |
| * | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2318-484/+685
| |\ \ \ \
| * | | | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-201-3/+3
| * | | | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-204-151/+157
| * | | | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-202-31/+30
| | |_|/ / | |/| | |