summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-262-25/+144
|\
| * 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 #685 from fredizzimo/windows10_instructions_typoErez Zukerman2016-08-261-2/+2
| |\ \
| | * | Fix minor typo in the readmeFred Sundvik2016-08-251-2/+2
| |/ /
* | | Fix bad mergeFred Sundvik2016-08-262-4/+2
* | | Remove google test submoduleFred Sundvik2016-08-251-0/+0
* | | Split vision_division into Makefile/rules.mkFred Sundvik2016-08-252-75/+72
* | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2555-336/+2855
|\| |
| * | 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
| | * | Merge pull request #1 from jackhumbert/masterDamien2016-08-253-3/+7
| | |\ \
| | * | | - 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-239-4/+695
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'dbroqua2016-08-2386-2749/+4770
| | |\ \ \ \
| | * | | | | - 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-2512-7/+702
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | 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-2515-51/+1313
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed naming of Analog pins to differentiate them from DIO pins used by Quant...IBNobody2016-08-251-32/+32
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_di...IBNobody2016-08-253-3/+7
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Added pin support for A0-A7IBNobody2016-08-254-13/+13
| | * | | | | | | NightlyIBNobody2016-08-235-55/+652
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/origin/master' into vision_divisio...IBNobody2016-08-2376-2666/+4492
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-2330-10/+1519
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Fixed line endingIBNobody2016-08-231-1/+1
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-2346-2656/+2973
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | NightlyIBNobody2016-08-217-161/+321
| | * | | | | | | | | In Progress MergeIBNobody2016-08-204-18/+137