summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-195-1859/+18050
|\
| * Merge pull request #964 from climbalima/masterJack Humbert2016-12-195-1859/+18050
| |\
| | * added case stl from se7en9057climbalima2016-12-194-0/+17931
| | * better switch spacing in svgclimbalima2016-12-141-1859/+119
* | | planck preonic updateJack Humbert2016-12-193-30/+8
* | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-1954-215/+2262
|\| |
| * | Merge pull request #963 from Wilba6582/fix_900Jack Humbert2016-12-192-4/+4
| |\ \
| | * | Fixes issue #900Wilba65822016-12-202-4/+4
| * | | Flips off MIDI and API_SYSEXErez Zukerman2016-12-192-2/+2
| |/ /
| * | Merge pull request #958 from pvinis/masterJack Humbert2016-12-181-12/+12
| |\ \
| | * | make a sysctl MO button so i can quickly use the arrowsPavlos Vinieratos2016-12-161-12/+12
| * | | Merge pull request #961 from Dbroqua/masterJack Humbert2016-12-181-2/+2
| |\ \ \
| | * | | - Revert local fail o_Odbroqua2016-12-175-0/+9
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-12-1750-245/+2003
| | |\ \ \
| | | * \ \ Merge pull request #14 from jackhumbert/masterDamien2016-12-1750-245/+2003
| | | |\ \ \
| | * | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-12-17191-2405/+14432
| | |\| | | |
| | | * | | | Merge pull request #13 from jackhumbert/masterDamien2016-12-09191-2405/+14432
| | | |\ \ \ \
| | * | | | | | - Added capslock keydbroqua2016-12-171-2/+2
| | |/ / / / /
| | * | | | | - Mergeddbroqua2016-11-275-9/+0
| * | | | | | Merge pull request #962 from stanleylai/masterJack Humbert2016-12-1811-0/+350
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Stanley Lai2016-12-1839-196/+1893
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Adds a troubleshooting layout for resetting the EEPROMErez Zukerman2016-12-161-0/+140
| * | | | | | Removes alt/j dual functionErez Zukerman2016-12-161-6/+6
| * | | | | | Merge pull request #957 from priyadi/qwertz-dot-commaJack Humbert2016-12-152-23/+100
| |\ \ \ \ \ \
| | * | | | | | QWERTZ style dot & comma, move QUOT to SCLN positionPriyadi Iman Nurcahyo2016-12-162-23/+100
| |/ / / / / /
| * | | | | | Merge pull request #956 from sgoodwin/masterJack Humbert2016-12-151-0/+1
| |\ \ \ \ \ \
| | * | | | | | Make keymap compile again.Samuel Ryan Goodwin2016-12-151-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #949 from priyadi/promethiumJack Humbert2016-12-153-94/+31
| |\ \ \ \ \ \
| | * | | | | | fine tune trackpoint initializationPriyadi Iman Nurcahyo2016-12-142-90/+21
| | * | | | | | disable remote modePriyadi Iman Nurcahyo2016-12-141-1/+0
| | * | | | | | Enable Adafruit BLE supportPriyadi Iman Nurcahyo2016-12-142-2/+2
| | * | | | | | Pretend to be Thinkpad USB KeyboardPriyadi Iman Nurcahyo2016-12-141-2/+8
| | * | | | | | Enable PS2 remote modePriyadi Iman Nurcahyo2016-12-141-0/+1
| * | | | | | | Merge pull request #952 from pvinis/masterJack Humbert2016-12-151-63/+108
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | tap dance for some layers. one tap sysctl, two taps mouse.Pavlos Vinieratos2016-12-091-3/+29
| | * | | | | | add light for some layersPavlos Vinieratos2016-12-091-0/+19
| | * | | | | | separate sysctl and mouse layersPavlos Vinieratos2016-12-091-57/+57
| | * | | | | | add alt keyPavlos Vinieratos2016-12-091-2/+2
| | * | | | | | media keysPavlos Vinieratos2016-12-091-11/+11
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #953 from priyadi/ibm_terminalJack Humbert2016-12-1518-0/+1063
| |\ \ \ \ \ \
| | * | | | | | My layout for M-122 terminal keyboardPriyadi Iman Nurcahyo2016-12-143-0/+345
| | * | | | | | Update KEYMAP macro to be consistent with the rest of QMKPriyadi Iman Nurcahyo2016-12-144-105/+58
| | * | | | | | IBM Terminal M-122 converter supportPriyadi Iman Nurcahyo2016-12-1415-0/+765
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #955 from askreet/powerDrawPerKeyboardJack Humbert2016-12-152-1/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow power consumption to be set per-keyboard.Kyle Smith2016-12-142-1/+6
| |/ / / / /
| * | | | | Merge pull request #948 from climbalima/masterJack Humbert2016-12-1211-9/+438
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | svg bug fix and added pilcrow to hand wireclimbalima2016-12-1211-9/+438
| | | | * | Added XD60 supportStanley Lai2016-12-1811-0/+350
| | | | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'Stanley Lai2016-12-171043-16377/+67867
| | | | |\ \ | | |_|_|/ / | |/| | | |
* / | | | | rgb clean-up, api clean-upJack Humbert2016-12-196-35/+77
|/ / / / /