summaryrefslogtreecommitdiffstats
path: root/keyboards
AgeCommit message (Expand)AuthorFilesLines
2017-04-04Add B1gtuna Miuni32Adam YH Lee10-0/+390
2016-11-19remove KC expansion from GH60Seth Chandler4-99/+55
2016-11-19move KC expansion to separate macrosSeth Chandler4-23/+66
2016-11-19merge upstream/masterSeth Chandler45-252/+1949
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_firmwareclimbalima20-123/+1189
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756
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-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-13add sethbc keymap for gh60 and update macro expansion in connection with sameSeth Chandler3-15/+96
2016-11-13update sethbc keymapSeth Chandler1-1/+1
2016-11-12Merge pull request #12 from jackhumbert/masterDamien1-3/+3
2016-11-12Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua15-538/+1231
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-11returned to oclimbalima1-4/+4
2016-11-11 Changes to be committed:climbalima29-68/+2119
2016-11-09Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody1-3/+3
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/masterDamien15-538/+1231
2016-11-01Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody12-66/+759
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 Zukerman3-0/+426
2016-11-01Merge pull request #836 from 20lives/masterErez Zukerman7-472/+695
2016-10-30Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2-58/+98
2016-10-28Fixing Debounce - WIPIBNobody1-1/+1
2016-10-28Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody13-37/+484
2016-10-26- Fixed typo in gh60/dbroqua layoutdbroqua1-1/+1
2016-10-26re-introduce brackets layerlucwastiaux1-2/+24
2016-10-26Merge pull request #827 from Dbroqua/masterJack Humbert3-6/+88
2016-10-26Merge pull request #849 from hot-leaf-juice/masterJack Humbert1-4/+4
2016-10-26Merge pull request #847 from yinshanyang/masterJack Humbert1-0/+13
2016-10-26Merge pull request #841 from jacwib/masterJack Humbert3-27/+118
2016-10-25[alphadox] remove tmk reset codeAlpha Chen2-10/+0
2016-10-25[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen1-0/+3
2016-10-25add alphadox layouts to atreus and ergodoxAlpha Chen5-0/+268