summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-11-19Merge remote-tracking branch 'upstream/master'xyverz1-1/+1
2016-11-19don't always detect a matrix change (fixes debounce)Jack Humbert1-1/+1
2016-11-17Merge remote-tracking branch 'upstream/master'xyverz151-917/+7753
2016-11-17Merge pull request #883 from climbalima/masterJack Humbert25-129/+760
2016-11-17fixed readme conflictsclimbalima1-20/+2
2016-11-17should have fixed conflixedclimbalima13-268/+10
2016-11-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima24-249/+1453
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756
2016-11-16Merge pull request #882 from seebs/masterJack Humbert2-0/+244
2016-11-16dvorak/plover keyboard layoutSeebs2-0/+244
2016-11-16Merge pull request #880 from psyill/masterJack Humbert6-0/+678
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert3-13/+3
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert1-7/+7
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert3-1/+120
2016-11-16Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2-2/+7
2016-11-16Merge pull request #860 from IBNobody/masterJack Humbert7-226/+394
2016-11-15fixed conflictclimbalima1-3/+0
2016-11-15fixed extra pasteclimbalima1-3/+2
2016-11-13Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans Ellegård6-0/+678
2016-11-13oops, fixed inverted if statementSeth Chandler1-6/+6
2016-11-13update sethbc ergodox keymapSeth Chandler3-13/+3
2016-11-13update sethbc keymapSeth Chandler1-1/+1
2016-11-12Merge pull request #12 from jackhumbert/masterDamien7-4/+237
2016-11-12Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua18-548/+1257
2016-11-12- Added dbroqua_hhkb layout for Satan PCBdbroqua2-0/+119
2016-11-11Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima1-2/+19
2016-11-11Added both revisions into one folderclimbalima11-101/+327
2016-11-11Merge pull request #868 from potz/masterJack Humbert1-0/+58
2016-11-11returned to oclimbalima1-4/+4
2016-11-11 Changes to be committed:climbalima29-68/+2119
2016-11-10Merge pull request #870 from NoahAndrews/patch-1Erez Zukerman1-1/+1
2016-11-09Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody5-3/+178
2016-11-09Add proper shortcode for KC_DELETE to keycode.txtNoah Andrews1-1/+1
2016-11-08Add brazilian ABNT2 keymapPotiguar Faga1-0/+58
2016-11-07Merge pull request #867 from fredizzimo/variable_traceJack Humbert4-0/+175
2016-11-07Merge pull request #852 from J3RN/remove-z-slash-controlsJack Humbert1-3/+3
2016-11-06Add documentation for the variable tracingFred Sundvik2-0/+32
2016-11-06Add possibility to control variable trace from makeFred Sundvik3-5/+38
2016-11-06Add variable traceFred Sundvik2-0/+110
2016-11-06Removed the control action when holding z or /Jonathan Arnett1-3/+3
2016-11-05Increase the infinity60 system tick frequencyFred Sundvik2-2/+7
2016-11-03Merge pull request #11 from jackhumbert/masterDamien18-548/+1257
2016-11-01Adding SKIP_GIT to speed up compiles.IBNobody1-18/+39
2016-11-01Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody15-76/+785
2016-11-01Implements dedicated text zoom keysErez Zukerman2-3/+7
2016-11-01Merge pull request #851 from J3RN/momentaryErez Zukerman1-5/+5
2016-11-01Merge pull request #843 from lucwastiaux/masterErez Zukerman4-1/+428
2016-11-01Merge pull request #836 from 20lives/masterErez Zukerman7-472/+695
2016-11-01Updates to keymap file.xyverz1-9/+57
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-23 14:29:24 +0100