Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_line_endings | Fred Sundvik | 2016-08-27 | 102 | -2716/+2713 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 1 | -23/+142 |
| |\ | |||||
| * | | Fix bad merge | Fred Sundvik | 2016-08-26 | 2 | -4/+2 |
| * | | Split vision_division into Makefile/rules.mk | Fred Sundvik | 2016-08-25 | 2 | -75/+72 |
| * | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 50 | -333/+2839 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-24 | 3 | -0/+419 |
| |\ \ \ | |||||
| * | | | | Split kitten_paw into Makefile/rules.mk | Fred Sundvik | 2016-08-23 | 2 | -75/+73 |
| * | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 33 | -490/+1324 |
| |\ \ \ \ | |||||
| * | | | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 16 | -58/+75 |
| * | | | | | Split subproject make files into Makefile and rules.mk | Fred Sundvik | 2016-08-20 | 28 | -605/+705 |
| * | | | | | Split keyboard makefiles into rules and Makefile | Fred Sundvik | 2016-08-20 | 55 | -1902/+1791 |
* | | | | | | Normalize line endings | Fred Sundvik | 2016-08-27 | 21 | -3204/+3204 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #664 from linsomniac/infinity_readme | Erez Zukerman | 2016-08-26 | 1 | -23/+144 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Making the existing firmware link better | Sean Reifschneider | 2016-08-24 | 1 | -1/+2 |
| * | | | | Changes based on @fredizzimo review, flashing Infinity details | Sean Reifschneider | 2016-08-24 | 1 | -0/+34 |
| * | | | | Changes from review by @fredizzimo and @Xyverz | Sean Reifschneider | 2016-08-22 | 1 | -19/+16 |
| * | | | | Tweaks after review. | Sean Reifschneider | 2016-08-19 | 1 | -3/+3 |
| * | | | | Restructuring of the ergodox README. | Sean Reifschneider | 2016-08-19 | 1 | -29/+105 |
| * | | | | Noting the change directory. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| * | | | | Adding submodule note. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| * | | | | Adding nicer Infinity build instructions. | Sean Reifschneider | 2016-08-19 | 1 | -0/+11 |
* | | | | | Merge pull request #659 from Dbroqua/master | Jack Humbert | 2016-08-25 | 15 | -161/+319 |
|\ \ \ \ \ | |||||
| * | | | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) | dbroqua | 2016-08-25 | 2 | -1/+33 |
| * | | | | | - Updated kc60/readme | dbroqua | 2016-08-25 | 2 | -0/+76 |
| * | | | | | - Fixed layout for kc60 | dbroqua | 2016-08-24 | 6 | -18/+18 |
| * | | | | | - Updated kc60.h for 2x 1u backspace (K49) | dbroqua | 2016-08-24 | 3 | -3/+119 |
| * | | | | | - Updated readme by adding link on kle for each layer | dbroqua | 2016-08-24 | 1 | -0/+3 |
| * | | | | | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 3 | -0/+419 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 52 | -575/+2291 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | - Added PrintScreen key on multimedia layer | dbroqua | 2016-08-22 | 2 | -2/+2 |
| * | | | | | - Inverted key Tab and Esc | dbroqua | 2016-08-21 | 2 | -12/+12 |
| * | | | | | - Moved Insert/Del in Esc layer | dbroqua | 2016-08-19 | 3 | -7/+7 |
| * | | | | | - Updated lower and raise layer | dbroqua | 2016-08-19 | 2 | -126/+46 |
| * | | | | | - Added readme file and layout preview | dbroqua | 2016-08-19 | 2 | -0/+11 |
| * | | | | | - Moved Home/End/PgUp/PgDn on arrow keys | dbroqua | 2016-08-19 | 1 | -9/+9 |
| * | | | | | - Moved Brite function on esc to avoid conflict with ctrl key. | dbroqua | 2016-08-19 | 1 | -4/+4 |
| * | | | | | - Updated dbroqua layout for planck keyboard | dbroqua | 2016-08-19 | 1 | -0/+314 |
* | | | | | | Merge pull request #683 from ickerwx/master | Jack Humbert | 2016-08-25 | 9 | -53/+322 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into kitten_paw | René Werner | 2016-08-25 | 3 | -0/+419 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | fixed defaulf keymap, added my own keymap | René Werner | 2016-08-25 | 7 | -105/+123 |
| * | | | | | | added my personal keymap | René Werner | 2016-08-23 | 2 | -0/+251 |
| * | | | | | | Merge branch 'kitten_paw' | René Werner | 2016-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Fixed wrong keycode in default keymap | René Werner | 2016-08-23 | 1 | -1/+1 |
* | | | | | | | Merge pull request #681 from IBNobody/vision_division_dev | Jack Humbert | 2016-08-25 | 14 | -51/+1304 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed naming of Analog pins to differentiate them from DIO pins used by Quant... | IBNobody | 2016-08-25 | 1 | -32/+32 |
| * | | | | | | | Added pin support for A0-A7 | IBNobody | 2016-08-25 | 3 | -5/+5 |
| * | | | | | | | Nightly | IBNobody | 2016-08-23 | 5 | -55/+652 |
| * | | | | | | | Merge remote-tracking branch 'refs/remotes/origin/master' into vision_divisio... | IBNobody | 2016-08-23 | 36 | -490/+1743 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Nightly | IBNobody | 2016-08-21 | 6 | -161/+312 |
| * | | | | | | | In Progress Merge | IBNobody | 2016-08-20 | 4 | -18/+137 |