summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-08-24Merge remote-tracking branch 'refs/remotes/origin/master' into vision_divisio...IBNobody76-2666/+4492
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody30-10/+1519
2016-08-24Fixed line endingIBNobody1-1/+1
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody46-2656/+2973
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert9-4/+695
2016-08-23move to ergodox-ez onlyJason Green4-1/+1
2016-08-23Remove unneeded includeJason Green1-1/+0
2016-08-23add missing #includeJason Green1-0/+1
2016-08-23Merge pull request #671 from Talljoe/one-handJack Humbert10-5/+210
2016-08-23Merge pull request #673 from coderkun/masterJack Humbert1-0/+2
2016-08-23Merge pull request #675 from Xyverz/masterJack Humbert1-1/+1
2016-08-23Merge pull request #676 from ickerwx/kitten_pawJack Humbert9-0/+611
2016-08-23TxBolt (Steno) Serial protocol for Ergodox EzJason Green3-0/+419
2016-08-23Added USB Virtual Serial supportJason Green6-4/+276
2016-08-22Added support for the Kitten Paw controllerRené Werner9-0/+611
2016-08-22NightlyIBNobody7-161/+321
2016-08-22Merge remote-tracking branch 'upstream/master'Xyverz44-2447/+2762
2016-08-22Added missing key K3A to KEYMAP() macro in tv44.hXyverz1-1/+1
2016-08-22Merge pull request #669 from fredizzimo/windows10_build_instructionsJack Humbert1-2/+49
2016-08-22Merge pull request #668 from fredizzimo/line_endingsJack Humbert27-2169/+2262
2016-08-22Merge pull request #674 from kyleberry/masterJack Humbert1-1/+1
2016-08-21Fixing DvorakKyle Berry1-1/+1
2016-08-21Drop method to set Unicode input key and declare start and finish methods as ...coderkun2-13/+4
2016-08-21Add method to set Unicode input key for ISO 14755coderkun2-2/+13
2016-08-21Add one-hand key to planck/experimental keymap.Joe Wasson2-4/+5
2016-08-21Add default swap configs for a couple of boards.Joe Wasson3-0/+45
2016-08-21Improve one-hand support by adding more actions and tap keys.Joe Wasson3-9/+89
2016-08-21Add one-hand support.Joe Wasson5-1/+80
2016-08-20In Progress MergeIBNobody4-18/+137
2016-08-20Add warning about line endingsFred Sundvik1-0/+2
2016-08-20Add instructions for Windows 10 subsystem for LinuxFred Sundvik1-2/+47
2016-08-20Initial CommmitIBNobody10-1/+387
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
2016-08-20Normalize line endingsFred Sundvik26-2169/+2169
2016-08-20Add .gitattributes to ensure correct line endingsFred Sundvik1-0/+93
2016-08-20MergeIBNobody1-356/+194
2016-08-20MergeIBNobody0-0/+0
2016-08-20fixed color detection routine in makefileIBNobody1-194/+195
2016-08-20fixed color detection routine in makefileIBNobody1-0/+161
2016-08-20MergeIBNobody0-0/+0
2016-08-20Merge remote-tracking branch 'upstream/master'Xyverz66-92/+6560
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-20fixed color detection routine in makefileIBNobody1-194/+356
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene1-1/+1
2016-08-20Merge https://github.com/IBNobody/qmk_firmwareIBNobody1-22/+22
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ...Nicholas Keene8-111/+98
2016-08-20fixed color detection routine in makefileIBNobody1-194/+356