summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Update readme.mdXyverz2016-08-171-1/+1
| * Create readme.mdXyverz2016-08-171-0/+5
* | tap-dance: Major rework, to make it more reliableGergely Nagy2016-08-171-1/+1
|/
* Merge remote-tracking branch 'upstream/master'Xyverz2016-08-136-1237/+1244
|\
| * ergodox: Update my keymap to v1.5Gergely Nagy2016-08-126-1237/+1244
* | Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds per...Ian Sterling2016-08-091-0/+311
* | Delete keymap.cXyverz2016-08-081-184/+0
* | Delete old_keymap.cXyverz2016-08-081-311/+0
* | Delete readme.mdXyverz2016-08-081-10/+0
* | Delete dvorak.pngXyverz2016-08-081-0/+0
* | Adding my own keymaps to the following keyboards:Ian Sterling2016-08-084-0/+505
|/
* Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
|\
| * rebaseSeth Chandler2016-07-303-0/+119
* | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
|\ \
| * | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| * | Updated my keymapJack Humbert2016-07-302-20/+21
| |\|
* | | Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
|\ \ \
| * | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| * | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-311-1/+1
| | |/ | |/|
* | | Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
* | | Generate version information to version.hFred Sundvik2016-07-313-0/+3
|/ /
* / Update some obsolete referencesGergely Nagy2016-07-301-1/+1
|/
* Small fix for infinity include guardFred Sundvik2016-07-291-3/+3
* Fix typo in the readme.Fred Sundvik2016-07-291-1/+1
* A couple of more Ergodox readme fixesFred Sundvik2016-07-291-2/+2
* Unify the ErgoDox EZ and Infinity documentationFred Sundvik2016-07-291-8/+13
* Refer to the right path in the readmeFred Sundvik2016-07-291-1/+1
* Move Ergodox readme from ez subfolder to parentFred Sundvik2016-07-291-0/+0
* Include the main Makefile before including Ergodox infinity driversFred Sundvik2016-07-291-4/+4
* Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik2016-07-2914-2/+2
* Remove the Infinity Ergodox default keymapFred Sundvik2016-07-292-282/+0
* Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
* Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
* Fix config.h include guardsFred Sundvik2016-07-292-4/+4
* Define weak matrix user function for Infinity ErgodoxFred Sundvik2016-07-291-0/+9
* Change _delay_ms to wait_ms in algernon keymapFred Sundvik2016-07-291-1216/+1217
* Move some of the Ergodox config settings to sharedFred Sundvik2016-07-293-37/+37
* Add empty led control functions to Infinity ErgodoxFred Sundvik2016-07-292-0/+96
* Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-2919-31/+42
* All Ez keymaps compilesFred Sundvik2016-07-2958-58/+70
* Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29219-0/+27312