summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ChibiOS conf migrations... take 3 (#11261)Nick Brassel2020-12-2116-6905/+287
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-211-1/+1
|\
| * Fix small typo in V-USB configuration descriptor (#11253)Ryan2020-12-211-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-201-0/+18
|\|
| * Doctor: add check for .git folder (#11208)Ryan2020-12-201-0/+18
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-201-2/+2
|\|
| * Follow symlinks when listing keyboards. (#11250)Nick Brassel2020-12-201-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-201-1/+1
|\|
| * [Keymap] fix keyboards/helix/rev2/keymaps/default/oled_display.c (#11228)Takeshi ISHII2020-12-201-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-195-5/+56
|\|
| * VIA Support: MF68 (#11030)MechMerlin2020-12-195-5/+56
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-192-4/+8
|\|
| * Change keyboard json format to bring it inline with the current api (#11231)Zach White2020-12-192-4/+8
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1917-0/+1842
|\|
| * [Keyboard] Add drashna's dactyl manuform 5x6 with trackball (#11062)Drashna Jaelre2020-12-1917-0/+1842
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-191-13/+17
|\|
| * simplify qmk doctor to make room for #11208 (#11242)Zach White2020-12-181-13/+17
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-181-1/+1
|\|
| * Updated usage of qmk c2json (#11148)precondition2020-12-181-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-189-32/+14
|\|
| * Add the ability to exclude keyboards from travis builds (#11178)Zach White2020-12-189-32/+14
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-189-42/+33
|\|
| * Various compilation fixes for avr-gcc 10 (#9269)Joel Challis2020-12-189-42/+33
* | Fix duplicate I2C_KEYMAP_START define (#11237)Ryan2020-12-171-2/+1
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2020-12-1815-570/+550
|\|
| * Run cformat and dos2unix manually (#11235)Ryan2020-12-1715-570/+550
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1710-0/+411
|\|
| * [Keyboard] add MT64RGB (#10865)maikong2020-12-1710-0/+411
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-172-0/+95
|\|
| * [Keymap] ISO layout for KBD67 rev 2.0 (#11136)hekekee2020-12-162-0/+95
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-179-0/+348
|\|
| * [Keyboard] add Labyrinth75 (#11135)Liviturtle2020-12-169-0/+348
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-173-27/+29
|\|
| * [Keymap] Update based on massdrop/ctrl core changes n(#11134)r-pufky2020-12-163-27/+29
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-171-1/+1
|\|
| * [Keyboard] Update config for 10 ble oled usbhub pad (#11066)haierwangwei20052020-12-161-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-178-0/+274
|\|
| * [Keyboard] Add POS78 keyboard (#11024)smssmssms2020-12-168-0/+274
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1714-0/+525
|\|
| * [Keyboard] Add program_yoink (#10963)melonbred2020-12-1614-0/+525
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1711-0/+1661
|\|
| * [Keyboard] Box75 (#10949)Álvaro A. Volpato2020-12-1611-0/+1661
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1711-0/+1681
|\|
| * [Keyboard] Iron180 (#10948)Álvaro A. Volpato2020-12-1611-0/+1681
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-179-0/+1620
|\|
| * [Keyboard] Technika (#10946)Álvaro A. Volpato2020-12-169-0/+1620
* | Add modifier state to the split keyboard transport (#10400)Casey Webster2020-12-172-0/+78
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-161-0/+2
|\|
| * Yet another stab at trying to get github actions to push (#11230)Joel Challis2020-12-161-0/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-169-0/+298
|\|