summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24168-1634/+12955
|\
| * Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-233-0/+419
| |\
| | * move to ergodox-ez onlyJason Green2016-08-233-0/+0
| | * Remove unneeded includeJason Green2016-08-231-1/+0
| | * add missing #includeJason Green2016-08-231-0/+1
| | * TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
| * | Merge pull request #671 from Talljoe/one-handJack Humbert2016-08-235-4/+50
| |\ \
| | * | Add one-hand key to planck/experimental keymap.Joe Wasson2016-08-202-4/+5
| | * | Add default swap configs for a couple of boards.Joe Wasson2016-08-203-0/+45
| * | | Merge pull request #675 from Xyverz/masterJack Humbert2016-08-231-1/+1
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master'Xyverz2016-08-2116-276/+451
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Added missing key K3A to KEYMAP() macro in tv44.hXyverz2016-08-211-1/+1
| * | | | Merge pull request #676 from ickerwx/kitten_pawJack Humbert2016-08-239-0/+611
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added support for the Kitten Paw controllerRené Werner2016-08-229-0/+611
| | | |/ | | |/|
| * / | Fixing DvorakKyle Berry2016-08-211-1/+1
| |/ /
| * | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\ \
| | * | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | * | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| * | | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1961-86/+6509
| | |\ \
| | * | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| | * | | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| | * | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| * | | | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-191-1/+1
| | * | | The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene2016-08-198-111/+98
| | * | | The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
| * | | | Merge pull request #662 from toneman77/iso_satanJack Humbert2016-08-196-85/+117
| |\ \ \ \
| | * | | | made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni2016-08-185-59/+86
| | * | | | cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni2016-08-181-17/+20
| | * | | | corrected the split rshift key to realityToni2016-08-182-9/+11
| * | | | | Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert2016-08-193-0/+200
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add the workman-dead layout for kc60zs2016-08-193-0/+200
| * | | | | forgot media keysToni2016-08-191-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into amj60Toni2016-08-1947-89/+5699
| |\ \ \ \ \
| | * | | | | Added dbroqua layout for planck keyboardDamien2016-08-181-0/+314
| | * | | | | Merge pull request #652 from iFreilicht/masterJack Humbert2016-08-1840-0/+5227
| | |\ \ \ \ \
| | | * | | | | Added info to docsFelix Uhl2016-08-181-1/+1
| | | * | | | | Merge pull request #1 from jackhumbert/masterFelix Uhl2016-08-18100-1407/+6306
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | BugfixesFelix Uhl2016-08-181-6/+7
| | | * | | | | Final link fixFelix Uhl2016-08-181-2/+2
| | | * | | | | More link fixingFelix Uhl2016-08-181-6/+6
| | | * | | | | Fixed links againFelix Uhl2016-08-181-2/+2
| | | * | | | | Fixed dead linkFelix Uhl2016-08-181-1/+1
| | | * | | | | Minor documentation changesFelix Uhl2016-08-182-28/+21
| | | * | | | | Fixed links againFelix Uhl2016-08-181-3/+5
| | | * | | | | Fixed pictures and linksFelix Uhl2016-08-181-15/+13
| | | * | | | | Documentation overhaul.Felix Uhl2016-08-1810-9/+3138
| | | * | | | | Small changes, renamed keymapFelix Uhl2016-08-184-213/+236
| | | * | | | | Minor changes to felix keymapFelix Uhl2016-08-153-17/+54