summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-2315-477/+628
|\
| * Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
| |\
| | * Merge pull request #760 from algernon/ergodox-ez/algernonErez Zukerman2016-09-2213-475/+616
| | |\
| | | * Update the ergodox/algernon keymap to v1.7Gergely Nagy2016-09-1813-475/+616
| * | | Adds EPRM reset keyErez Zukerman2016-09-222-2/+12
| |/ /
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-2217-20/+1017
|\| |
| * | Merge pull request #771 from UnderSampled/masterJack Humbert2016-09-213-0/+340
| |\ \
| | * | Fixed Impossible Layout readme tables (again)UnderSampled2016-09-211-0/+12
| | * | Corrected Impossible Layout readme tablesStephen Christie2016-09-211-30/+0
| | * | Filled Impossible Layout documentationStephen Christie2016-09-211-1/+90
| | * | Fixed Qwerty Fn layer to match documented designStephen Christie2016-09-201-5/+5
| | * | Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-09-19543-15161/+37682
| | |\ \
| | * \ \ Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-08-02335-2269/+11874
| | |\ \ \
| | * | | | Moved Insert, PrtSc, Pause to Adjust; Corner enterStephen Christie2016-08-021-35/+35
| | * | | | Corrected Qwerty/Fn Mismatch.Stephen Christie2016-08-011-4/+4
| | * | | | Added quote key.Stephen Christie2016-07-311-7/+7
| | * | | | Moved CapsLk, ScrollLk, and NumLk to Adjust layerStephen Christie2016-07-301-17/+17
| | * | | | Connected all layers through Adjust layerStephen Christie2016-07-291-85/+69
| | * | | | Fixed Function keys (Impossible layout)Stephen Christie2016-07-281-4/+4
| | * | | | Modified Qwerty, created Qwerty with numbersStephen Christie2016-07-281-24/+40
| | * | | | General table cleanup.Stephen Christie2016-07-261-48/+49
| | * | | | Modified Plover layer for Impossible's home position.Stephen Christie2016-07-261-9/+10
| | * | | | Removed unused layers (keeping QWERTY for later/reference)Stephen Christie2016-07-261-77/+4
| | * | | | Removed unused layers (left QWERTY for later use/reference)Stephen Christie2016-07-261-47/+3
| | * | | | Table for FnStephen Christie2016-07-221-0/+12
| | * | | | Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.Stephen Christie2016-07-221-6/+19
| | * | | | First draft of the 'impossible' layout.Stephen Christie2016-07-213-0/+359
| * | | | | Merge pull request #769 from pvinis/fix/tap-dance-each-tap-restoreJack Humbert2016-09-213-5/+8
| |\ \ \ \ \
| | * | | | | add user_data fieldPavlos Vinieratos2016-09-211-0/+2
| | * | | | | formattingPavlos Vinieratos2016-09-212-5/+5
| | * | | | | restore each_tap callbackPavlos Vinieratos2016-09-211-0/+1
| * | | | | | Merge pull request #768 from Dbroqua/masterJack Humbert2016-09-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | - Updated backlight levels for KC60dbroqua2016-09-211-1/+1
| * | | | | | | Merge pull request #767 from IBNobody/lets_split_reduce_hex_sizeJack Humbert2016-09-2110-14/+668
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Created I2C and Serial keymaps for unit testingIBNobody2016-09-204-0/+632
| | * | | | | | Made Serial and I2C not include the OtherIBNobody2016-09-206-14/+36
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-202-5/+9
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-193-3/+159
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
* | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-212-5/+9
|\| | | | | | |
| * | | | | | | Merge pull request #765 from jakllsch/more-shifted-dvorak-keycodesJack Humbert2016-09-201-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Add more shifted Dvorak key code definitionsJonathan A. Kollasch2016-09-191-0/+4
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #763 from Dbroqua/masterJack Humbert2016-09-201-5/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | - Removed HHKB like layoutdbroqua2016-09-192-114/+0
| | * | | | | Merge remote-tracking branch 'origin/master'dbroqua2016-09-19119-1264/+5828
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #4 from jackhumbert/masterDamien2016-09-19119-1264/+5828
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | - Updated dbroqua layout for kc60dbroqua2016-09-191-5/+5
| | * | | | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2016-09-172-0/+114
| | |/ / / / /
| | * | | | | Merge pull request #3 from jackhumbert/masterDamien2016-08-29191-10238/+11639
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #2 from jackhumbert/masterDamien2016-08-2635-104/+2461
| | |\ \ \ \ \ \
* | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-1923-286/+912
|\| | | | | | | |