summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-08-27Add Google Test submoduleFred Sundvik2-0/+3
2016-08-27Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert40-6251/+6252
2016-08-27Merge branch 'master' into fix_line_endingsFred Sundvik115-3306/+3664
2016-08-27Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert115-3308/+3666
2016-08-27Fix travis_compiled_pushFred Sundvik1-2/+2
2016-08-27Normalize line endingsFred Sundvik39-6322/+6322
2016-08-27Set eep files to binary modeFred Sundvik1-0/+1
2016-08-26Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2-25/+144
2016-08-26Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman1-23/+144
2016-08-26Merge pull request #685 from fredizzimo/windows10_instructions_typoErez Zukerman1-2/+2
2016-08-25Fix bad mergeFred Sundvik2-4/+2
2016-08-25Fix minor typo in the readmeFred Sundvik1-2/+2
2016-08-25Remove google test submoduleFred Sundvik1-0/+0
2016-08-25Split vision_division into Makefile/rules.mkFred Sundvik2-75/+72
2016-08-25Merge branch 'master' into makefile_overhaulFred Sundvik55-336/+2855
2016-08-25Merge pull request #659 from Dbroqua/masterJack Humbert15-161/+319
2016-08-25- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2-1/+33
2016-08-25Merge pull request #683 from ickerwx/masterJack Humbert9-53/+322
2016-08-25Merge pull request #681 from IBNobody/vision_division_devJack Humbert15-51/+1313
2016-08-25Merge pull request #682 from jeebak/jd45-jeebakJack Humbert3-0/+568
2016-08-25Merge pull request #680 from replicaJunction/layout-atreus-replicaJunctionJack Humbert8-0/+258
2016-08-25Fixed naming of Analog pins to differentiate them from DIO pins used by Quant...IBNobody1-32/+32
2016-08-25Merge remote-tracking branch 'upstream/master' into kitten_pawRené Werner12-7/+702
2016-08-25fixed defaulf keymap, added my own keymapRené Werner7-105/+123
2016-08-25Make the "extra" key in the top row another backspaceJeeBak Kim1-10/+10
2016-08-25Merge pull request #1 from jackhumbert/masterDamien3-3/+7
2016-08-25- Updated kc60/readmedbroqua2-0/+76
2016-08-25[jd45] Port jeebak's planck keymap to jd45JeeBak Kim3-9/+560
2016-08-25[jd45] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim1-0/+17
2016-08-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_di...IBNobody3-3/+7
2016-08-25Added pin support for A0-A7IBNobody4-13/+13
2016-08-25Added replicaJunction keymapJoshua T8-0/+258
2016-08-24- Fixed layout for kc60dbroqua6-18/+18
2016-08-24- Updated kc60.h for 2x 1u backspace (K49)dbroqua3-3/+119
2016-08-24Making the existing firmware link betterSean Reifschneider1-1/+2
2016-08-24Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider1-0/+34
2016-08-24Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert2-2/+6
2016-08-24Merge pull request #646 from nclundsten/masterJack Humbert1-1/+1
2016-08-24quantum: Move qk_ucis_state to process_unicode.cGergely Nagy2-2/+6
2016-08-24- Updated readme by adding link on kle for each layerdbroqua1-0/+3
2016-08-24Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik9-4/+695
2016-08-24Fix slight inconsistencyFred Sundvik1-13/+15
2016-08-24NightlyIBNobody5-55/+652
2016-08-24Merge remote-tracking branch 'refs/remotes/origin/master' into vision_divisio...IBNobody76-2666/+4492
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody30-10/+1519
2016-08-24Fixed line endingIBNobody1-1/+1
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody46-2656/+2973
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua9-4/+695
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert9-4/+695
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua86-2749/+4770