summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2016-11-191-1/+1
|\
| * don't always detect a matrix change (fixes debounce)Jack Humbert2016-11-181-1/+1
* | Merge remote-tracking branch 'upstream/master'xyverz2016-11-16151-917/+7753
|\|
| * Merge pull request #883 from climbalima/masterJack Humbert2016-11-1625-129/+760
| |\
| | * 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-1624-249/+1453
| | |\ | | |/ | |/|
| * | Merge pull request #882 from seebs/masterJack Humbert2016-11-162-0/+244
| |\ \
| | * | 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-127-4/+237
| | |\| |
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-1218-548/+1257
| | |\ \ \
| | | * \ \ Merge pull request #11 from jackhumbert/masterDamien2016-11-0318-548/+1257
| | | |\ \ \
| | * | | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| | |/ / / /
| | * | | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-261-1/+1
| | * | | | Merge pull request #10 from jackhumbert/masterDamien2016-10-2656-235/+2562
| | |\ \ \ \
| * | \ \ \ \ 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 pull request #860 from IBNobody/masterJack Humbert2016-11-167-226/+394
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-085-3/+178
| | |\ \ \ \ \ \
| | * | | | | | | Adding SKIP_GIT to speed up compiles.IBNobody2016-11-011-18/+39
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-0115-76/+785
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | added fixed debounce codeIBNobody2016-10-291-73/+70
| | * | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmwareIBNobody2016-10-29105-1181/+5745
| | |\ \ \ \ \ \ \
| | | * | | | | | | Made scanning more efficientIBNobody2016-10-291-31/+24
| | | * | | | | | | Refactoring Matrix scanningIBNobody2016-10-282-88/+95
| | | * | | | | | | Fixing Debounce - WIPIBNobody2016-10-283-84/+174
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2818-51/+613
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Fixing Line TerminationsIBNobody2016-10-233-472/+472
| | | * | | | | | | Fixed some large keyboard bugsIBNobody2016-10-235-7/+50
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2382-503/+4324
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Updating Vision keyboard filesIBNobody2016-10-182-99/+116
| | | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-030-0/+0
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-068-30/+313
| | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * 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
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #868 from potz/masterJack Humbert2016-11-101-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \