Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | having trouble with conflicts | climbalima | 2016-12-03 | 3 | -20/+0 |
* | cleaned up personal projects | climbalima | 2016-12-03 | 21 | -7375/+0 |
* | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 3 | -22/+35 |
|\ | |||||
| * | changed readme | climbalima | 2016-11-19 | 2 | -2/+3 |
| * | added the pinout for pro micro into maxipad | climbalima | 2016-11-19 | 2 | -3/+10 |
* | | added plate files for lets split | climbalima | 2016-12-03 | 21 | -0/+7375 |
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-03 | 2 | -1/+5834 |
|\| | |||||
| * | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
* | | just saving | climbalima | 2016-11-18 | 10 | -232/+54 |
|/ | |||||
* | 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 | 20 | -123/+1189 |
|\ | |||||
| * | 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 | 1 | -3/+3 |
| | |\| | |||||
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-11-12 | 15 | -538/+1231 |
| | |\ \ | |||||
| | | * \ | Merge pull request #11 from jackhumbert/master | Damien | 2016-11-03 | 15 | -538/+1231 |
| | | |\ \ | |||||
| | * | | | | - 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 #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 remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-08 | 1 | -3/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-11-01 | 12 | -66/+759 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fixing Debounce - WIP | IBNobody | 2016-10-28 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-28 | 13 | -37/+484 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fixing Line Terminations | IBNobody | 2016-10-23 | 3 | -472/+472 |
| * | | | | | Fixed some large keyboard bugs | IBNobody | 2016-10-23 | 2 | -0/+13 |
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-10-23 | 71 | -475/+4204 |
| |\ \ \ \ \ | |||||
| * | | | | | | Updating Vision keyboard files | IBNobody | 2016-10-18 | 2 | -99/+116 |
* | | | | | | | 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 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Removed the control action when holding z or / | Jonathan Arnett | 2016-11-06 | 1 | -3/+3 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Implements dedicated text zoom keys | Erez Zukerman | 2016-11-01 | 2 | -3/+7 |
* | | | | | | Merge pull request #851 from J3RN/momentary | Erez Zukerman | 2016-10-31 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Switched to momentary | Jonathan Arnett | 2016-10-09 | 1 | -5/+5 |
* | | | | | | | Merge pull request #843 from lucwastiaux/master | Erez Zukerman | 2016-10-31 | 3 | -0/+426 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | re-introduce brackets layer | lucwastiaux | 2016-10-26 | 1 | -2/+24 |
| * | | | | | | | adding readme | lucwastiaux | 2016-10-23 | 1 | -0/+15 |