summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Add B1gtuna Miuni32Adam YH Lee2017-04-0310-0/+390
* remove KC expansion from GH60Seth Chandler2016-11-194-99/+55
* move KC expansion to separate macrosSeth Chandler2016-11-194-23/+66
* merge upstream/masterSeth Chandler2016-11-1945-252/+1949
|\
| * fixed readme conflictsclimbalima2016-11-161-20/+2
| * should have fixed conflixedclimbalima2016-11-1613-268/+10
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-11-1620-123/+1189
| |\
| | * dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
| | * Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
| | |\
| | | * Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| | * | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-163-13/+3
| | |\ \
| | | * | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| | | |/
| | * | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
| | |\ \
| | | * | oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| | | * | update sethbc keymapSeth Chandler2016-11-121-1/+1
| | | |/
| | * | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-163-1/+120
| | |\ \
| | | * | Merge pull request #12 from jackhumbert/masterDamien2016-11-121-3/+3
| | | |\|
| | | * | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-1215-538/+1231
| | | |\ \
| | | | * \ Merge pull request #11 from jackhumbert/masterDamien2016-11-0315-538/+1231
| | | | |\ \
| | | * | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| | | |/ / /
| | | * | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-261-1/+1
| | * | | | Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2016-11-162-2/+7
| | |\ \ \ \
| | | * | | | Increase the infinity60 system tick frequencyFred Sundvik2016-11-052-2/+7
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-081-3/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-0112-66/+759
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fixing Debounce - WIPIBNobody2016-10-281-1/+1
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2813-37/+484
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fixing Line TerminationsIBNobody2016-10-233-472/+472
| | * | | | | Fixed some large keyboard bugsIBNobody2016-10-232-0/+13
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2371-475/+4204
| | |\ \ \ \ \
| | * | | | | | Updating Vision keyboard filesIBNobody2016-10-182-99/+116
| * | | | | | | Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-11-1614-29/+278
| |\ \ \ \ \ \ \
| | * | | | | | | fixed conflictclimbalima2016-11-141-3/+0
| | * | | | | | | fixed extra pasteclimbalima2016-11-141-3/+2
| | * | | | | | | Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima2016-11-101-2/+19
| | |\ \ \ \ \ \ \
| | | * | | | | | | returned to oclimbalima2016-11-101-4/+4
| | * | | | | | | | Added both revisions into one folderclimbalima2016-11-1011-101/+327
| | |/ / / / / / /
| | * | | | | | | Changes to be committed:climbalima2016-11-1029-68/+2119
| * | | | | | | | Updated my repo to current qmkclimbalima2016-11-1625-98/+756
| | |_|_|_|_|/ / | |/| | | | | |
* / | | | | | | add sethbc keymap for gh60 and update macro expansion in connection with sameSeth Chandler2016-11-133-15/+96
|/ / / / / / /
* | | | | / / Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
| |_|_|_|/ / |/| | | | |
* | | | | | Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
* | | | | | Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
|\ \ \ \ \ \
| * | | | | | Switched to momentaryJonathan Arnett2016-10-091-5/+5
* | | | | | | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-313-0/+426
|\ \ \ \ \ \ \
| * | | | | | | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| * | | | | | | adding readmelucwastiaux2016-10-231-0/+15
| * | | | | | | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| * | | | | | | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| * | | | | | | type brackets in symbol layer, using bottom rowlucwastiaux2016-10-232-8/+18