summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| * | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-261-2/+14
| * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
* | | 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 pull request #677 from SmackleFunky/masterJack Humbert2016-08-233-0/+419
| |\ \
| | * | move to ergodox-ez onlyJason Green2016-08-233-0/+0
| | * | Remove unneeded includeJason Green2016-08-231-1/+0
| | * | add missing #includeJason Green2016-08-231-0/+1
| | * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
* | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2318-484/+685
|\| | |
| * | | Add default swap configs for a couple of boards.Joe Wasson2016-08-201-0/+24
| |/ /
| * | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\ \
| | * | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | * | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| | |/
| * | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
| |\ \
| | * | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| | * | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| | * | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| | |/
| * | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
| |\ \ | | |/ | |/|
| | * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-191-1/+1
| | * The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-198-111/+98
| | * The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
* | | 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
|/ /
* | One last change to the readme.Xyverz2016-08-181-3/+1
* | One last formatting changeXyverz2016-08-181-1/+1
* | more formatting changesXyverz2016-08-181-90/+90
* | Hopefully this fixes the layout diagrams.Xyverz2016-08-181-91/+91
* | Added a readme, tidied up comments in the keymap.Xyverz2016-08-182-29/+147
* | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz2016-08-171-0/+5
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:28:09 +0000