summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30245-1742/+3096
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert2016-07-307-9/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Update some obsolete referencesGergely Nagy2016-07-307-9/+9
| |/ / / / / / /
| * | | | | | | Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert2016-07-291-13/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Fix the quick aliases documentation sectionFred Sundvik2016-07-291-13/+15
| * | | | | | | | Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert2016-07-29225-1795/+1651
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | 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
| | * | | | | | | Speed up ChibiOS keymap compilationFred Sundvik2016-07-291-17/+33
| | * | | | | | | 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-2921-32/+46
| | * | | | | | | All Ez keymaps compilesFred Sundvik2016-07-2958-58/+70
| | * | | | | | | Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29219-23/+58
| |/ / / / / / /
| * | | | | | | Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
| |\ \ \ \ \ \ \
| | * | | | | | | ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-28/+687
| * | | | | | | | Merge pull request #583 from coderkun/coderkun_neo2Erez Zukerman2016-07-292-7/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | disable sleep LEDcoderkun2016-07-291-1/+2
| | * | | | | | | | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
| | * | | | | | | | use Ergodox EZ’s third LED for “scroll lock”coderkun2016-07-291-2/+9
| | * | | | | | | | fix grave (GRV) and acute (ACUT) accentscoderkun2016-07-291-2/+2
| | |/ / / / / / /
| * | | | | | | | Merge pull request #580 from MatsLanGoH/patch-1Erez Zukerman2016-07-291-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fixed a typoMatthias2016-07-291-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #578 from 0xdec/masterJack Humbert2016-07-284-0/+234
| |\ \ \ \ \ \ \
| | * | | | | | | Create 0xdec Preonic keymapJordi Orlando2016-07-284-0/+234
| * | | | | | | | Merge pull request #577 from hot-leaf-juice/masterJack Humbert2016-07-283-0/+211
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Added readme.md for custom layout.Callum Oakley2016-07-281-0/+48
| | * | | | | | | | Added custom keymap.Callum Oakley2016-07-272-0/+163
| * | | | | | | | | Merge pull request #573 from algernon/f/make-all-stop-on-errorJack Humbert2016-07-281-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | tmk_core/rules.mk: Make PRINT_ERROR* stop on errorGergely Nagy2016-07-271-2/+2
| | |/ / / / / / /
| * | | | | | | | Merge pull request #572 from algernon/f/tap-dance-debugJack Humbert2016-07-282-0/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | tap-dance: Add some debugging supportGergely Nagy2016-07-272-0/+16
| | |/ / / / / / /
| * | | | | | | | Merge pull request #570 from sethbc/fix_bone2planck_buildJack Humbert2016-07-281-10/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove unnecessary includesSeth Chandler2016-07-271-2/+0
| | * | | | | | | | fix numerous errors in bone2planck keymapSeth Chandler2016-07-271-10/+10
| | |/ / / / / / /
| * | | | | | | | Merge pull request #569 from sethbc/fix_stanleylai_warningsJack Humbert2016-07-281-10/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | kill warnings filling up travis buildlogSeth Chandler2016-07-271-10/+5
| | |/ / / / / / /
| * | | | | | | | Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert2016-07-281-1/+1
| |\ \ \ \ \ \ \ \