summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Expand)AuthorFilesLines
2016-08-02Merge pull request #592 from sethbc/ez-sethbcErez Zukerman3-0/+119
2016-08-02Merge pull request #593 from J3RN/masterErez Zukerman2-22/+26
2016-08-02Merge pull request #600 from adiabatic/masterErez Zukerman4-14/+1167
2016-08-02Updates ErgoDox readmeErez Zukerman1-9/+6
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi3-13/+1166
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi218-0/+27114
2016-07-31Generate version information to version.hFred Sundvik3-0/+3
2016-07-30Updated readme with recent changesJonathan Arnett1-3/+6
2016-07-30Updated my keymapJack Humbert2-20/+21
2016-07-30rebaseSeth Chandler3-0/+119
2016-07-30Update some obsolete referencesGergely Nagy1-1/+1
2016-07-29Small fix for infinity include guardFred Sundvik1-3/+3
2016-07-29Fix typo in the readme.Fred Sundvik1-1/+1
2016-07-29A couple of more Ergodox readme fixesFred Sundvik1-2/+2
2016-07-29Unify the ErgoDox EZ and Infinity documentationFred Sundvik1-8/+13
2016-07-29Refer to the right path in the readmeFred Sundvik1-1/+1
2016-07-29Move Ergodox readme from ez subfolder to parentFred Sundvik1-0/+0
2016-07-29Include the main Makefile before including Ergodox infinity driversFred Sundvik1-4/+4
2016-07-29Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik14-2/+2
2016-07-29Remove the Infinity Ergodox default keymapFred Sundvik2-282/+0
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
2016-07-29Fix config.h include guardsFred Sundvik2-4/+4
2016-07-29Define weak matrix user function for Infinity ErgodoxFred Sundvik1-0/+9
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29Move some of the Ergodox config settings to sharedFred Sundvik3-37/+37
2016-07-29Add empty led control functions to Infinity ErgodoxFred Sundvik2-0/+96
2016-07-29Most ergodox keymaps compiles on InfinityFred Sundvik19-31/+42
2016-07-29All Ez keymaps compilesFred Sundvik58-58/+70
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik219-0/+27312