summaryrefslogtreecommitdiffstats
path: root/keyboards
AgeCommit message (Collapse)AuthorFilesLines
2016-08-20Merge https://github.com/jackhumbert/qmk_firmwareOlivier557-2063/+28598
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
Adding jafo layout.
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
The Ordinary Layout is the unsurprising layout
2016-08-20Merge remote-tracking branch 'upstream/master'Xyverz61-86/+6509
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
to be
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene8-111/+98
to be
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
Satan Cleanup
2016-08-19Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert3-0/+200
Add the workman-dead layout for kc60
2016-08-19Adding jafo layout.Sean Reifschneider5-0/+214
2016-08-19Add the workman-dead layout for kc60zs3-0/+200
2016-08-19forgot media keysToni1-1/+1
2016-08-19Merge remote-tracking branch 'origin/master' into amj60Toni47-89/+5699
merge with upstream
2016-08-19Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2-53/+178
Updated readme.md to reflect this change.
2016-08-18Added dbroqua layout for planck keyboardDamien1-0/+314
2016-08-18Merge pull request #652 from iFreilicht/masterJack Humbert40-0/+5227
Added S60-X keyboard
2016-08-18Merge pull request #650 from Xyverz/masterJack Humbert5-88/+157
Minor changes to keymaps and other files
2016-08-18made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni5-59/+86
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
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
Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
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 Uhl100-1407/+6306
Merging from base Repo
2016-08-18BugfixesFelix Uhl1-6/+7
2016-08-18Final link fixFelix Uhl1-2/+2
2016-08-18More link fixingFelix Uhl1-6/+6
2016-08-18Fixed links againFelix Uhl1-2/+2
Note to self: check before commiting.
2016-08-18Fixed dead linkFelix Uhl1-1/+1
2016-08-18Minor documentation changesFelix Uhl2-28/+21
2016-08-18Fixed links againFelix Uhl1-3/+5
2016-08-18Fixed pictures and linksFelix Uhl1-15/+13
2016-08-18Documentation overhaul.Felix Uhl10-9/+3138
2016-08-18cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni1-17/+20
2016-08-18Small changes, renamed keymapFelix Uhl4-213/+236
Added MicMute Revived all dead keys Removed OS Shift
2016-08-18corrected the split rshift key to realityToni2-9/+11
fixed my keymap in the process to adjust to that
2016-08-18One last change to the readme.Xyverz1-3/+1
2016-08-18One last formatting changeXyverz1-1/+1
2016-08-18more formatting changesXyverz1-90/+90
2016-08-18Hopefully this fixes the layout diagrams.Xyverz1-91/+91
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz2-29/+147
2016-08-18Returned RAISE and LOWER buttons to their original functions - too many ↵Xyverz1-3/+3
inopportune ENTER inputs. :-(
2016-08-18Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz1-0/+5
2016-08-18Merge remote-tracking branch 'upstream/master'Xyverz19-2/+1044
this merge is necessary,
2016-08-18Merge pull request #645 from algernon/f/tap-dance/bufferingJack Humbert2-2/+2
tap-dance rework