summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-07Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne
2016-11-07Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-07Merge pull request #867 from fredizzimo/variable_traceJack Humbert
2016-11-07Merge pull request #852 from J3RN/remove-z-slash-controlsJack Humbert
2016-11-06Add documentation for the variable tracingFred Sundvik
2016-11-06Add possibility to control variable trace from makeFred Sundvik
2016-11-06Add variable traceFred Sundvik
2016-11-06Removed the control action when holding z or /Jonathan Arnett
2016-11-06Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne
2016-11-06Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-11-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-01Implements dedicated text zoom keysErez Zukerman
2016-10-31Merge pull request #851 from J3RN/momentaryErez Zukerman
2016-10-31Merge pull request #843 from lucwastiaux/masterErez Zukerman
2016-10-31Merge pull request #836 from 20lives/masterErez Zukerman
2016-10-31Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-30Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert
2016-10-30Merge pull request #854 from slebedev/masterJack Humbert
2016-10-30Merge pull request #857 from fredizzimo/fix_makefile_too_long_bashJack Humbert
2016-10-30Run each sumbmake in a separate shellFred Sundvik
2016-10-29Add link to article about Unicode Hex Input in readmeSergey Lebedev
2016-10-26Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-26re-introduce brackets layerlucwastiaux
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 upstreamLior Haim
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-23Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo
2016-10-23Unicode WinCompose input methodPriyadi Iman Nurcahyo
2016-10-23adding readmelucwastiaux
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