summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-08-23Merge pull request #675 from Xyverz/masterJack Humbert1-1/+1
2016-08-23Merge pull request #676 from ickerwx/kitten_pawJack Humbert9-0/+611
2016-08-22Added support for the Kitten Paw controllerRené Werner9-0/+611
2016-08-22Merge remote-tracking branch 'upstream/master'Xyverz44-2447/+2762
2016-08-22Added missing key K3A to KEYMAP() macro in tv44.hXyverz1-1/+1
2016-08-22Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert1-2/+49
2016-08-22Merge pull request #668 from fredizzimo/line_endingsJack Humbert27-2169/+2262
2016-08-22Merge pull request #674 from kyleberry/masterJack Humbert1-1/+1
2016-08-21Fixing DvorakKyle Berry1-1/+1
2016-08-20Add warning about line endingsFred Sundvik1-0/+2
2016-08-20Add instructions for Windows 10 subsystem for LinuxFred Sundvik1-2/+47
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
2016-08-20Normalize line endingsFred Sundvik26-2169/+2169
2016-08-20Add .gitattributes to ensure correct line endingsFred Sundvik1-0/+93
2016-08-20Merge remote-tracking branch 'upstream/master'Xyverz66-92/+6560
2016-08-20Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2-17/+10
2016-08-20Changed my keymap to match normal keymaps.Xyverz1-314/+198
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene1-1/+1
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene8-111/+98
2016-08-20Bringing over changes from default map.Sean Reifschneider1-4/+3
2016-08-19Merge pull request #662 from toneman77/iso_satanJack Humbert6-85/+117
2016-08-19Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert3-0/+200
2016-08-19Adding jafo layout.Sean Reifschneider5-0/+214
2016-08-19Add the workman-dead layout for kc60zs3-0/+200
2016-08-19Merge pull request #660 from toneman77/amj60Jack Humbert10-0/+650
2016-08-19forgot media keysToni1-1/+1
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni52-95/+5750
2016-08-19Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2-53/+178
2016-08-19Merge pull request #655 from Dbroqua/patch-1Jack Humbert1-0/+314
2016-08-19Merge pull request #656 from Vifon/dynamic_macrosJack Humbert1-2/+6
2016-08-19Improve the dynamic macro documentationWojciech Siewierski1-2/+6
2016-08-18Added dbroqua layout for planck keyboardDamien1-0/+314
2016-08-18Merge pull request #652 from iFreilicht/masterJack Humbert41-0/+5228
2016-08-18Merge pull request #651 from algernon/f/register16Jack Humbert3-4/+44
2016-08-18Merge pull request #650 from Xyverz/masterJack Humbert5-88/+157
2016-08-18Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fixJack Humbert1-1/+1
2016-08-18made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni5-59/+86
2016-08-18smyll typo fixedToni1-1/+1
2016-08-18amj60 variant of the readmeToni1-0/+30
2016-08-18first attempt at documentation for the amj60 boardToni1-0/+57
2016-08-18planck/circuit: Update after the latest tap-dance changeGergely Nagy1-1/+1
2016-08-18uniform whitespaceToni1-45/+45
2016-08-18initial commit for the AMJ60 PCBToni8-0/+563
2016-08-18Added info to docsFelix Uhl1-1/+1
2016-08-18Merge pull request #1 from jackhumbert/masterFelix Uhl115-1531/+6981
2016-08-18BugfixesFelix Uhl1-6/+7
2016-08-18Final link fixFelix Uhl1-2/+2
2016-08-18More link fixingFelix Uhl1-6/+6