aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | specialise music variablesJack Humbert2016-12-121-3/+3
* | | | | re-enable audio and extrakeysJack Humbert2016-12-124-5/+27
* | | | | Merge pull request #946 from climbalima/masterJack Humbert2016-12-121-11/+19
|\| | | |
| * | | | changed svg after mergeclimbalima2016-12-101-470/+470
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-10149-2031/+6676
| |\| | |
| * | | | changed svg to support proto pcbclimbalima2016-12-101-474/+482
* | | | | Merge pull request #945 from priyadi/planck_priyadiJack Humbert2016-12-121-6/+2
|\ \ \ \ \
| * | | | | Remove unneeded options to reduce firmware sizePriyadi Iman Nurcahyo2016-12-101-6/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #944 from priyadi/negmousefixJack Humbert2016-12-121-1/+1
|\ \ \ \ \
| * | | | | Allow negative values for mouse movementsPriyadi Iman Nurcahyo2016-12-101-1/+1
| |/ / / /
* | | | | Merge pull request #943 from lucwastiaux/masterJack Humbert2016-12-123-27/+62
|\ \ \ \ \
| * | | | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2