summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Moved PREVENT_STUCK_MODIFIERS to config.hJoshua T2016-07-302-3/+3
* Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-8/+10
* Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30234-1700/+2992
|\
| * Update some obsolete referencesGergely Nagy2016-07-302-2/+2
| * 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-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
| * | 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 #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 #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
| |\ \
| | * | update NO_AMP to NO_AMPRSeth Chandler2016-07-271-1/+1
| | |/
| * | Merge pull request #566 from SmackleFunky/masterJack Humbert2016-07-281-2/+2
| |\ \
| | * | Allow toggling out of plover layerSmackleFunky2016-07-271-2/+2
| | |/
| * / Move to keyboardsMazin Bokhari2016-07-262-0/+350
| |/
| * disable midi by defaultJack Humbert2016-07-261-2/+2
* | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2676-324/+6517
|\|
| * Fixes midi functionalityJack Humbert2016-07-242-3/+3
| * Merge pull request #548 from CommandLineDesign/CMD-PreonicJack Humbert2016-07-243-0/+432
| |\
| | * Updated ReadmeJonathan Lucas2016-07-231-1/+77
| | * Did a derp and forgot to set Trans on Arrow layercommandlinedesign2016-07-231-5/+5