summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-08-23Fixed line endingIBNobody
2016-08-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-08-21Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert
2016-08-21Merge pull request #668 from fredizzimo/line_endingsJack Humbert
2016-08-21Merge pull request #674 from kyleberry/masterJack Humbert
2016-08-21Fixing DvorakKyle Berry
2016-08-20Add warning about line endingsFred Sundvik
2016-08-20Add instructions for Windows 10 subsystem for LinuxFred Sundvik
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert
2016-08-20Normalize line endingsFred Sundvik
2016-08-20Add .gitattributes to ensure correct line endingsFred Sundvik
2016-08-20MergeIBNobody
2016-08-20MergeIBNobody
2016-08-20fixed color detection routine in makefileIBNobody
2016-08-20fixed color detection routine in makefileIBNobody
2016-08-20MergeIBNobody
2016-08-19Merge remote-tracking branch 'upstream/master'Xyverz
2016-08-19Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz
2016-08-19Changed my keymap to match normal keymaps.Xyverz
2016-08-19fixed color detection routine in makefileIBNobody
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene
2016-08-19Merge https://github.com/IBNobody/qmk_firmwareIBNobody
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene
2016-08-19fixed color detection routine in makefileIBNobody
2016-08-19Bringing over changes from default map.Sean Reifschneider
2016-08-19Merge pull request #662 from toneman77/iso_satanJack Humbert
2016-08-19Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert
2016-08-19Adding jafo layout.Sean Reifschneider
2016-08-19Add the workman-dead layout for kc60zs
2016-08-19Merge pull request #660 from toneman77/amj60Jack Humbert
2016-08-19forgot media keysToni
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni
2016-08-18Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz
2016-08-18Merge pull request #655 from Dbroqua/patch-1Jack Humbert
2016-08-18Merge pull request #656 from Vifon/dynamic_macrosJack Humbert
2016-08-19Improve the dynamic macro documentationWojciech Siewierski
2016-08-18Added dbroqua layout for planck keyboardDamien
2016-08-18Merge pull request #652 from iFreilicht/masterJack Humbert
2016-08-18Merge pull request #651 from algernon/f/register16Jack Humbert
2016-08-18Merge pull request #650 from Xyverz/masterJack Humbert
2016-08-18Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fixJack Humbert
2016-08-18made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni
2016-08-18smyll typo fixedToni
2016-08-18amj60 variant of the readmeToni
2016-08-18first attempt at documentation for the amj60 boardToni
2016-08-18planck/circuit: Update after the latest tap-dance changeGergely Nagy
2016-08-18uniform whitespaceToni
2016-08-18initial commit for the AMJ60 PCBToni