summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-08-20Merge https://github.com/jackhumbert/qmk_firmwareOlivier
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-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-19The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene
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
2016-08-18Added info to docsFelix Uhl
2016-08-18Merge pull request #1 from jackhumbert/masterFelix Uhl
2016-08-18BugfixesFelix Uhl
2016-08-18Final link fixFelix Uhl
2016-08-18More link fixingFelix Uhl
2016-08-18Fixed links againFelix Uhl
2016-08-18Fixed dead linkFelix Uhl
2016-08-18Minor documentation changesFelix Uhl
2016-08-18Add a register/unregister_code16 pair of functionsGergely Nagy
2016-08-18Fixed links againFelix Uhl
2016-08-18Fixed pictures and linksFelix Uhl
2016-08-18Documentation overhaul.Felix Uhl
2016-08-18cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni
2016-08-18Small changes, renamed keymapFelix Uhl
2016-08-18corrected the split rshift key to realityToni
2016-08-18One last change to the readme.Xyverz
2016-08-18One last formatting changeXyverz