summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-205-10/+178
|\
| * [Keyboard] Update X-Bows Nature Keyboard (#11538)X-Bows Tech2021-01-194-10/+11
| * [Keymap] add happysalada (#11535)Raphael Megzari2021-01-191-0/+167
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-0/+251
|\|
| * [Keymap] Mac-friendly KBD 75% layouts (#11507)Aaron Ireland2021-01-192-0/+251
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-202-126/+154
|\|
| * Add stm32-dfu and apm32-dfu to bootloader.mk (#11019)Ryan2021-01-202-126/+154
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-204-73/+56
|\|
| * [Keyboard] Leafcutterlabs (#11464)Craig Gardner2021-01-194-73/+56
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-9/+18
|\|
| * Improve the Lighting Layers example in RGB Lighting docs (#11454)Joshua Diamond2021-01-191-9/+18
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-1/+1
|\|
| * Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234)Takeshi Nishio2021-01-191-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2011-0/+347
|\|
| * [Keyboard] Add Mesa TKL (#11294)MesaKeyboards2021-01-1911-0/+347
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-2/+2
|\|
| * Update info.json - Program Yoink (#11558)melonbred2021-01-191-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2078-82/+0
|\|
| * Remove `DESCRIPTION`, W-Z (#11633)Ryan2021-01-2078-82/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-20120-124/+0
|\|
| * Remove `DESCRIPTION`, R-V (#11632)Ryan2021-01-20120-124/+0
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-2078-80/+0
|\|
| * Remove `DESCRIPTION`, N-Q (#11631)Ryan2021-01-2078-80/+0
* | Switch to nano specs on ChibiOS builds - Round 2 (#11607)Joel Challis2021-01-201-0/+1
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-20285-330/+50
|\|
| * Remove `DESCRIPTION`, K-M (#11619)Ryan2021-01-20135-141/+0
| * Fixup declaration for _kill, add other missing syscalls, populate errno. (#11...Nick Brassel2021-01-191-36/+49
| * Remove `DESCRIPTION`, H-J (#11616)Ryan2021-01-20150-154/+1
* | Fix up comments showing how to execute config migration. (#11621)Nick Brassel2021-01-20289-289/+289
* | ChibiOS enable memory allocations (#11620)Nick Brassel2021-01-1916-16/+16
* | ChibiOS 20.3.2 (#11495)Nick Brassel2021-01-206-48/+144
* | ChibiOS conf migrations... take 10 (#11617)Nick Brassel2021-01-2025-2440/+79
* | Leftover early initialisation conversions (#11615)Nick Brassel2021-01-2013-16/+22
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-2021-29/+397
|\|
| * GCC 10 compatibility for Ploopy optical encoder (#11586)Glen D'souza2021-01-192-25/+53
| * change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap ...CMMS-Freather2021-01-1919-5/+343
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-194-0/+511
|\|
| * New keymaps with KC_LGUI on another key and scroll with encoder (#11479)Benjamin Garcia2021-01-194-0/+511
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-197-0/+512
|\|
| * [Keymap] Add peej userspace and keymaps (#11332)Paul James2021-01-197-0/+512
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-191-2/+86
|\|
| * Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)James Young2021-01-191-2/+86
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-195-14/+237
|\|
| * Caps Unlocked CU65 layout macro fixes (#11606)James Young2021-01-195-14/+237
* | Fixup builds on develop branch. (#11600)Nick Brassel2021-01-193-7/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1812-0/+383
|\|
| * [Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)datafx2021-01-1812-0/+383
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-184-178/+298
|\|
| * Naked64 Configurator update and rework (#11568)James Young2021-01-184-178/+298
* | ChibiOS conf migrations... take 9 (#11598)Nick Brassel2021-01-1815-8584/+387