summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-10-26Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-26Merge pull request #827 from Dbroqua/masterJack Humbert
2016-10-26Merge pull request #849 from hot-leaf-juice/masterJack Humbert
2016-10-26Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert
2016-10-26Merge pull request #847 from yinshanyang/masterJack Humbert
2016-10-26Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert
2016-10-26Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert
2016-10-26Merge pull request #841 from jacwib/masterJack Humbert
2016-10-26Merge pull request #831 from kejadlen/masterJack Humbert
2016-10-26Merge pull request #834 from kazufukurou/masterJack Humbert
2016-10-25[alphadox] remove tmk reset codeAlpha Chen
2016-10-25[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen
2016-10-25add alphadox layouts to atreus and ergodoxAlpha Chen
2016-10-25replace lock key with general power keyCallum Oakley
2016-10-25switched to standard volume keysCallum Oakley
2016-10-24add subproject env var to dockerfileAndre Silva
2016-10-24added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang
2016-10-23Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne
2016-10-23Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-10-231.2 updatejacwib
2016-10-23Unicode WinCompose input methodPriyadi Iman Nurcahyo
2016-10-23UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo
2016-10-22Update readme to reflect 1.1 changes.jacwib
2016-10-22Update keymap to reflect 1.1 changes.jacwib
2016-10-22Update readme to reflect changesjacwib
2016-10-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman
2016-10-20Merge pull request #832 from PhoenixRion/masterErez Zukerman
2016-10-19add programmer dvorak keymapArtyom Mironov
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks
2016-10-18Win10 Writer's Block - An ErgoDox Keymaph-parks
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-18update header fileRyan Ascheman
2016-10-18didn't read PR comment close enough, correcting folderRyan Ascheman
2016-10-18moving keymap to new locationRyan Ascheman
2016-10-18Merge remote-tracking branch 'upstream/master'Ryan Ascheman
2016-10-18Merge pull request #829 from r2d2rogers/masterJack Humbert
2016-10-18Merge pull request #824 from dsvensson/pegasushoofJack Humbert
2016-10-18Update ez.cRob Rogers
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert
2016-10-18removes planck/rev3 temporarilyJack Humbert
2016-10-17Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman
2016-10-17Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne
2016-10-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-17Move hand_swap_config to ez.c, removes error for infinityRob Rogers
2016-10-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-10-16Update MakefileJack Humbert
2016-10-16Merge pull request #815 from priyadi/unicode_mapJack Humbert
2016-10-16Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert
2016-10-16- Added HHKB like layout for KC60 pcbdbroqua