summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-16fixed readme conflictsclimbalima
2016-11-16should have fixed conflixedclimbalima
2016-11-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima
2016-11-16Merge https://github.com/climbalima/qmk_firmwareclimbalima
2016-11-16Updated my repo to current qmkclimbalima
2016-11-16Merge pull request #882 from seebs/masterJack Humbert
2016-11-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-16dvorak/plover keyboard layoutSeebs
2016-11-16Merge pull request #880 from psyill/masterJack Humbert
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert
2016-11-16Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert
2016-11-16Merge pull request #860 from IBNobody/masterJack Humbert
2016-11-15animations, midi, etcJack Humbert
2016-11-14fixed conflictclimbalima
2016-11-14fixed extra pasteclimbalima
2016-11-14Recommend WSL on Windows 10Noah Andrews
2016-11-13mostly workingJack Humbert
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans Ellegård
2016-11-13oops, fixed inverted if statementSeth Chandler
2016-11-13update sethbc ergodox keymapSeth Chandler
2016-11-13add sethbc keymap for gh60 and update macro expansion in connection with sameSeth Chandler
2016-11-12update sethbc keymapSeth Chandler
2016-11-12mergingJack Humbert
2016-11-12Merge pull request #12 from jackhumbert/masterDamien
2016-11-12Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua
2016-11-12- Added dbroqua_hhkb layout for Satan PCBdbroqua
2016-11-11Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne
2016-11-11Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-11-10Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-11-10Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima
2016-11-10Added both revisions into one folderclimbalima
2016-11-10Merge pull request #868 from potz/masterJack Humbert
2016-11-10returned to oclimbalima
2016-11-10 Changes to be committed:climbalima
2016-11-10Merge pull request #870 from NoahAndrews/patch-1Erez Zukerman
2016-11-08Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-11-08Add proper shortcode for KC_DELETE to keycode.txtNoah Andrews
2016-11-08Add brazilian ABNT2 keymapPotiguar Faga
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