summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* quantum: Move qk_ucis_state to process_unicode.cGergely Nagy2016-08-242-2/+6
* Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-239-4/+695
|\
| * move to ergodox-ez onlyJason Green2016-08-234-1/+1
| * 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
| * Added USB Virtual Serial supportJason Green2016-08-236-4/+276
* | Merge pull request #671 from Talljoe/one-handJack Humbert2016-08-2310-5/+210
|\ \
| * | 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
| * | Improve one-hand support by adding more actions and tap keys.Joe Wasson2016-08-203-9/+89
| * | Add one-hand support.Joe Wasson2016-08-205-1/+80
* | | Merge pull request #673 from coderkun/masterJack Humbert2016-08-231-0/+2
|\ \ \
| * | | Drop method to set Unicode input key and declare start and finish methods as ...coderkun2016-08-212-13/+4
| * | | Add method to set Unicode input key for ISO 14755coderkun2016-08-212-2/+13
| |/ /
* | | Merge pull request #675 from Xyverz/masterJack Humbert2016-08-231-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master'Xyverz2016-08-2144-2447/+2762
| |\ \ \ | | | |/ | | |/|
| * | | 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
| | |/ | |/|
* | | Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert2016-08-211-2/+49
|\ \ \
| * | | Add warning about line endingsFred Sundvik2016-08-201-0/+2
| * | | Add instructions for Windows 10 subsystem for LinuxFred Sundvik2016-08-201-2/+47
* | | | Merge pull request #668 from fredizzimo/line_endingsJack Humbert2016-08-2127-2169/+2262
|\ \ \ \
| * | | | Normalize line endingsFred Sundvik2016-08-2026-2169/+2169
| * | | | Add .gitattributes to ensure correct line endingsFred Sundvik2016-08-201-0/+93
| |/ / /
* | | | Merge pull request #674 from kyleberry/masterJack Humbert2016-08-211-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-1966-92/+6560
| |\ \ \ | | | |/ | | |/|
| * | | 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
* | | | | Merge pull request #660 from toneman77/amj60Jack Humbert2016-08-1910-0/+650
|\ \ \ \ \
| * | | | | forgot media keysToni2016-08-191-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into amj60Toni2016-08-1952-95/+5750
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #655 from Dbroqua/patch-1Jack Humbert2016-08-181-0/+314
|\ \ \ \ \ \