summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| * | | readme updateslucwastiaux2016-12-101-1/+4
| * | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10199-2387/+14766
| |\| |
| * | | use thumb cluster key to toggle brackets layerlucwastiaux2016-12-102-2/+3
| * | | added more shortcut keyslucwastiaux2016-11-052-9/+9
| * | | updated readmelucwastiaux2016-11-051-1/+2
| * | | removed brackets anywhere but in brackets layer, added mouse layer back in, r...lucwastiaux2016-11-053-20/+50
* | | | Merge pull request #942 from priyadi/cpp11Jack Humbert2016-12-121-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | The adafruit BLE C++ code requires -std=c++11Priyadi Iman Nurcahyo2016-12-101-1/+1
|/ / /
* | | Update readme.mdJack Humbert2016-12-061-1560/+2
* | | Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
|\ \ \
| * | | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| * | | Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
* | | | Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-057-10/+222
|\ \ \ \
| * | | | Update planck.cJack Humbert2016-12-041-14/+0
| * | | | Update rules.mkJack Humbert2016-12-040-0/+0
| * | | | Update rules.mkJack Humbert2016-12-041-3/+2
| * | | | Initial version of Raw HID interfaceWilba65822016-12-017-10/+237
* | | | | Merge pull request #935 from priyadi/promethiumJack Humbert2016-12-045-79/+197
|\ \ \ \ \