aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* / | Allow power consumption to be set per-keyboard.Kyle Smith2016-12-141-0/+2
|/ /
* | 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
* | | re-enable audio and extrakeysJack Humbert2016-12-122-4/+4
* | | 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-10108-356/+3734
| |\|
| * | 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
| | |/ | |/|
* | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
* | | readme updateslucwastiaux2016-12-101-1/+4
* | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10151-609/+11350
|\| |
| * | 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-052-2/+2
| |\ \ \
| | * | | Update planck.cJack Humbert2016-12-041-14/+0
| | * | | Update rules.mkJack Humbert2016-12-041-3/+2
| | * | | Initial version of Raw HID interfaceWilba65822016-12-012-2/+17
| * | | | Remove unnecessary build optionsPriyadi Iman Nurcahyo2016-12-052-4/+5
| * | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0511-193/+5851
| |\ \ \ \
| | * \ \ \ Merge pull request #932 from climbalima/masterJack Humbert2016-12-0411-193/+5851
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | having trouble with conflictsclimbalima2016-12-033-20/+0
| | | * | cleaned up personal projectsclimbalima2016-12-0321-7375/+0
| | | * | Merge https://github.com/climbalima/qmk_firmwareclimbalima2016-12-033-22/+35
| | | |\ \
| | | * | | added plate files for lets splitclimbalima2016-12-0321-0/+7375
| | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-032-1/+5834
| | | |\ \ \
| | | * | | | just savingclimbalima2016-11-1810-232/+54
| * | | | | | Trackpoint initializationPriyadi Iman Nurcahyo2016-12-052-1/+110
| * | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-12-0468-231/+1017
| |\| | | | |
| | * | | | | Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-0213-9/+47
| | |\ \ \ \ \
| | | * | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-0213-9/+47