Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
* | should have fixed conflixed | climbalima | 2016-11-16 | 13 | -268/+10 |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-11-16 | 24 | -249/+1453 |
|\ | |||||
| * | Merge pull request #882 from seebs/master | Jack Humbert | 2016-11-16 | 2 | -0/+244 |
| |\ | |||||
| | * | dvorak/plover keyboard layout | Seebs | 2016-11-16 | 2 | -0/+244 |
| |/ | |||||
| * | Merge pull request #880 from psyill/master | Jack Humbert | 2016-11-16 | 6 | -0/+678 |
| |\ | |||||
| | * | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | Hans EllegÄrd | 2016-11-13 | 6 | -0/+678 |
| * | | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap | Jack Humbert | 2016-11-16 | 3 | -13/+3 |
| |\ \ | |||||
| | * | | update sethbc ergodox keymap | Seth Chandler | 2016-11-13 | 3 | -13/+3 |
| | |/ | |||||
| * | | Merge pull request #877 from sethbc/update_sethbc_satan_keymap | Jack Humbert | 2016-11-16 | 1 | -7/+7 |
| |\ \ | |||||
| | * | | oops, fixed inverted if statement | Seth Chandler | 2016-11-13 | 1 | -6/+6 |
| | * | | update sethbc keymap | Seth Chandler | 2016-11-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #876 from Dbroqua/master | Jack Humbert | 2016-11-16 | 3 | -1/+120 |
| |\ \ | |||||
| | * | | Merge pull request #12 from jackhumbert/master | Damien | 2016-11-12 | 7 | -4/+237 |
| | |\| | |||||
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-11-12 | 18 | -548/+1257 |
| | |\ \ | |||||
| | | * \ | Merge pull request #11 from jackhumbert/master | Damien | 2016-11-03 | 18 | -548/+1257 |
| | | |\ \ | |||||
| | * | | | | - Added dbroqua_hhkb layout for Satan PCB | dbroqua | 2016-11-12 | 2 | -0/+119 |
| | |/ / / | |||||
| | * | | | - Fixed typo in gh60/dbroqua layout | dbroqua | 2016-10-26 | 1 | -1/+1 |
| | * | | | Merge pull request #10 from jackhumbert/master | Damien | 2016-10-26 | 56 | -235/+2562 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge pull request #866 from fredizzimo/infinity60_clockfixes | Jack Humbert | 2016-11-16 | 2 | -2/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Increase the infinity60 system tick frequency | Fred Sundvik | 2016-11-05 | 2 | -2/+7 |
| * | | | | | | Merge pull request #860 from IBNobody/master | Jack Humbert | 2016-11-16 | 7 | -226/+394 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-08 | 5 | -3/+178 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Adding SKIP_GIT to speed up compiles. | IBNobody | 2016-11-01 | 1 | -18/+39 |
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-01 | 15 | -76/+785 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | added fixed debounce code | IBNobody | 2016-10-29 | 1 | -73/+70 |
| | * | | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmware | IBNobody | 2016-10-29 | 105 | -1181/+5745 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Made scanning more efficient | IBNobody | 2016-10-29 | 1 | -31/+24 |
| | | * | | | | | | Refactoring Matrix scanning | IBNobody | 2016-10-28 | 2 | -88/+95 |
| | | * | | | | | | Fixing Debounce - WIP | IBNobody | 2016-10-28 | 3 | -84/+174 |
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-28 | 18 | -51/+613 |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||||
| | | * | | | | | | Fixing Line Terminations | IBNobody | 2016-10-23 | 3 | -472/+472 |
| | | * | | | | | | Fixed some large keyboard bugs | IBNobody | 2016-10-23 | 5 | -7/+50 |
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-23 | 82 | -503/+4324 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Updating Vision keyboard files | IBNobody | 2016-10-18 | 2 | -99/+116 |
| | | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-03 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-06 | 8 | -30/+313 |
| | |\ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-16 | 14 | -29/+278 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fixed conflict | climbalima | 2016-11-14 | 1 | -3/+0 |
| * | | | | | | | | | | | | fixed extra paste | climbalima | 2016-11-14 | 1 | -3/+2 |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-10 | 1 | -2/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | returned to o | climbalima | 2016-11-10 | 1 | -4/+4 |
| * | | | | | | | | | | | | | Added both revisions into one folder | climbalima | 2016-11-10 | 11 | -101/+327 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Changes to be committed: | climbalima | 2016-11-10 | 29 | -68/+2119 |
* | | | | | | | | | | | | | Updated my repo to current qmk | climbalima | 2016-11-16 | 25 | -98/+756 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #868 from potz/master | Jack Humbert | 2016-11-10 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add brazilian ABNT2 keymap | Potiguar Faga | 2016-11-08 | 1 | -0/+58 |
* | | | | | | | | | | | | | Merge pull request #870 from NoahAndrews/patch-1 | Erez Zukerman | 2016-11-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add proper shortcode for KC_DELETE to keycode.txt | Noah Andrews | 2016-11-08 | 1 | -1/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #867 from fredizzimo/variable_trace | Jack Humbert | 2016-11-07 | 4 | -0/+175 |
|\ \ \ \ \ \ \ \ \ \ \ \ |