summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2016-08-272-4/+4
|\
| * Correct typo in kc60 workman-dead keymapzs2016-08-262-4/+4
* | Rename infinity_chibios to infinity60, and add readmeFred Sundvik2016-08-2716-9/+37
* | Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-27102-2716/+2713
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-261-23/+142
| |\ \
| * | | Fix bad mergeFred Sundvik2016-08-262-4/+2
| * | | Split vision_division into Makefile/rules.mkFred Sundvik2016-08-252-75/+72
| * | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2550-333/+2839
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-243-0/+419
| |\ \ \
| * | | | Split kitten_paw into Makefile/rules.mkFred Sundvik2016-08-232-75/+73
| * | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2333-490/+1324
| |\ \ \ \
| * | | | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-2016-58/+75
| * | | | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-2028-605/+705
| * | | | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-2055-1902/+1791
* | | | | | Normalize line endingsFred Sundvik2016-08-2721-3204/+3204
| |_|_|_|/ |/| | | |
* | | | | 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 pull request #659 from Dbroqua/masterJack Humbert2016-08-2515-161/+319
|\ \ \ \ \
| * | | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2016-08-252-1/+33
| * | | | | - Updated kc60/readmedbroqua2016-08-252-0/+76
| * | | | | - Fixed layout for kc60dbroqua2016-08-246-18/+18
| * | | | | - Updated kc60.h for 2x 1u backspace (K49)dbroqua2016-08-243-3/+119
| * | | | | - Updated readme by adding link on kle for each layerdbroqua2016-08-241-0/+3
| * | | | | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-233-0/+419
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-2352-575/+2291
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | - Added PrintScreen key on multimedia layerdbroqua2016-08-222-2/+2
| * | | | | - Inverted key Tab and Escdbroqua2016-08-212-12/+12
| * | | | | - Moved Insert/Del in Esc layerdbroqua2016-08-193-7/+7
| * | | | | - Updated lower and raise layerdbroqua2016-08-192-126/+46
| * | | | | - Added readme file and layout previewdbroqua2016-08-192-0/+11
| * | | | | - Moved Home/End/PgUp/PgDn on arrow keysdbroqua2016-08-191-9/+9
| * | | | | - Moved Brite function on esc to avoid conflict with ctrl key.dbroqua2016-08-191-4/+4
| * | | | | - Updated dbroqua layout for planck keyboarddbroqua2016-08-191-0/+314
* | | | | | Merge pull request #683 from ickerwx/masterJack Humbert2016-08-259-53/+322
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into kitten_pawRené Werner2016-08-253-0/+419
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | fixed defaulf keymap, added my own keymapRené Werner2016-08-257-105/+123
| * | | | | | added my personal keymapRené Werner2016-08-232-0/+251
| * | | | | | Merge branch 'kitten_paw'René Werner2016-08-231-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fixed wrong keycode in default keymapRené Werner2016-08-231-1/+1
* | | | | | | Merge pull request #681 from IBNobody/vision_division_devJack Humbert2016-08-2514-51/+1304
|\ \ \ \ \ \ \
| * | | | | | | Fixed naming of Analog pins to differentiate them from DIO pins used by Quant...IBNobody2016-08-251-32/+32
| * | | | | | | Added pin support for A0-A7IBNobody2016-08-253-5/+5
| * | | | | | | NightlyIBNobody2016-08-235-55/+652