summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master'xyverz2016-11-16
|\
| * Merge pull request #883 from climbalima/masterJack Humbert2016-11-16
| |\
| | * fixed readme conflictsclimbalima2016-11-16
| | * should have fixed conflixedclimbalima2016-11-16
| | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-11-16
| | |\ | | |/ | |/|
| * | Merge pull request #882 from seebs/masterJack Humbert2016-11-16
| |\ \
| | * | dvorak/plover keyboard layoutSeebs2016-11-16
| |/ /
| * | Merge pull request #880 from psyill/masterJack Humbert2016-11-16
| |\ \
| | * | Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-13
| * | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-16
| |\ \ \
| | * | | update sethbc ergodox keymapSeth Chandler2016-11-13
| | |/ /
| * | | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-16
| |\ \ \
| | * | | oops, fixed inverted if statementSeth Chandler2016-11-13
| | * | | update sethbc keymapSeth Chandler2016-11-12
| | |/ /
| * | | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-16
| |\ \ \
| | * | | Merge pull request #12 from jackhumbert/masterDamien2016-11-12
| | |\| |
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-12
| | |\ \ \
| | | * \ \ Merge pull request #11 from jackhumbert/masterDamien2016-11-03
| | | |\ \ \
| | * | | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-12
| | |/ / / /
| | * | | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-26
| | * | | | Merge pull request #10 from jackhumbert/masterDamien2016-10-26
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2016-11-16
| |\ \ \ \ \ \
| | * | | | | | Increase the infinity60 system tick frequencyFred Sundvik2016-11-05
| * | | | | | | Merge pull request #860 from IBNobody/masterJack Humbert2016-11-16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-08
| | |\ \ \ \ \ \
| | * | | | | | | Adding SKIP_GIT to speed up compiles.IBNobody2016-11-01
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-01
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | added fixed debounce codeIBNobody2016-10-29
| | * | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmwareIBNobody2016-10-29
| | |\ \ \ \ \ \ \
| | | * | | | | | | Made scanning more efficientIBNobody2016-10-29
| | | * | | | | | | Refactoring Matrix scanningIBNobody2016-10-28
| | | * | | | | | | Fixing Debounce - WIPIBNobody2016-10-28
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-28
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Fixing Line TerminationsIBNobody2016-10-23
| | | * | | | | | | Fixed some large keyboard bugsIBNobody2016-10-23
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-23
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Updating Vision keyboard filesIBNobody2016-10-18
| | | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-03
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-06
| | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-11-16
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * fixed conflictclimbalima2016-11-14
| | | | | | | | | | | | | * fixed extra pasteclimbalima2016-11-14
| | | | | | | | | | | | | * Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima2016-11-10
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * returned to oclimbalima2016-11-10
| | | | | | | | | | | | | * | Added both revisions into one folderclimbalima2016-11-10
| | | | | | | | | | | | | |/
| | | | | | | | | | | | | * Changes to be committed:climbalima2016-11-10
| | | | | | | | | | | | * | Updated my repo to current qmkclimbalima2016-11-16
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #868 from potz/masterJack Humbert2016-11-10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add brazilian ABNT2 keymapPotiguar Faga2016-11-08
| * | | | | | | | | | | | | Merge pull request #870 from NoahAndrews/patch-1Erez Zukerman2016-11-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |