summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developfauxpark2021-06-1727-27/+1401
|\
| * OLED driver tweaks (#13215)Ryan2021-06-173-24/+22
| * [Keyboard] Add KMAC PAD (#13104)talsu2021-06-169-0/+603
| * [Keyboard] Minivan : add missing enable to support RGB LEDs (#13157)TerryMathews2021-06-161-0/+1
| * Document user song list file (#13101)Drashna Jaelre2021-06-151-1/+3
| * Fix overrun in oled_write_raw when not at (0, 0) (#13204)Jonathan Rascher2021-06-151-2/+3
| * [Keyboard] add mb44 keyboard (#12798)melonbred2021-06-1513-0/+769
| * [Keyboard] Allow user override of RGB_DISABLE_WHEN_USB_SUSPENDED for BM40 key...Albert Y2021-06-151-1/+1
* | core: wire up flash make target for Teensy 4.x (#13077)Michael Stapelberg2021-06-173-1/+7
* | Fix overrun in st7565_write_raw when not at (0, 0) (#13209)Jonathan Rascher2021-06-151-2/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-161-1/+1
|\|
| * [Keyboard] Fix layout in noon.h (#13087)Philip (Han) Suh2021-06-151-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-0/+31
|\|
| * [Keymap] ANAVI Macro Pad 2 add binary keymap (#13090)Leon Anavi2021-06-152-0/+31
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-161-2/+2
|\|
| * [Keyboard] Potato65 Hotswap Fixed mistake in key matrix (#13095)Aeonstrife2021-06-151-2/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-161-1/+1
|\|
| * Debian requires package libusb-dev to build bootloaderHID (#13105)Rickard von Essen2021-06-151-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-0/+4
|\|
| * Top level heading for common config (LED Matrix) (#13153)Brian Low2021-06-151-0/+2
| * Top level heading for common config (RGB Matrix) (#13120)Brian Low2021-06-151-0/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-0/+171
|\|
| * [Keymap] Keebio Iris rev4 - keymap with dual encoder support (#13063)R2021-06-153-0/+171
* | core: make RESET key work with Teensy 4.x (#13076)Michael Stapelberg2021-06-151-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-1/+7
|\|
| * Change Lufa-MS size (#13183)kb-elmo2021-06-153-1/+7
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-10/+23
|\|
| * Make atmel-dfu and chibios-dfu flashing behave more like caterina flashing. (...Purdea Andrei2021-06-163-10/+23
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1614-0/+559
|\|
| * [Keyboard] suv (#12957)AlisGraveNil2021-06-157-0/+288
| * [Keyboard] hatchback (#12958)AlisGraveNil2021-06-157-0/+271
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-3/+49
|\|
| * [Keyboard] Add via support for the Leopold FC980C (#12860)John Graham2021-06-153-3/+49
* | Limit saturation for RGB_MATRIX_JELLYBEAN_RAINDROPS (#12669)Albert Y2021-06-161-1/+1
* | Add asym_eager_defer_pk debounce type (#12689)Simon Arlott2021-06-165-3/+554
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-0/+42
|\|
| * [Keymap] ANAVI Macro Pad 2 add Skype keymap (#12664)Leon Anavi2021-06-152-0/+42
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-164-0/+148
|\|
| * [Keymap] add new keymap for pteron (#12474)Fidel Coria2021-06-154-0/+148
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-161-1/+1
|\|
| * [Docs] Update one_shot_keys.md (#12291)Thomas Museus Dabay2021-06-151-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-163-9/+99
|\|
| * [Keyboard] Add 'LAYOUT_65_ansi_split_bs_2_right_mods' support to KBDfans KBD6...Andy Freeland2021-06-153-9/+99
* | [Keyboard] Moved tokyo60/ into tokyokeyboard/tokyo60/. (#12023)James2021-06-1512-4/+4
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-1510-0/+258
|\|
| * add tender/macrowo_pad (#12786)Brandon Claveria2021-06-1610-0/+258
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-151-3/+1
|\|
| * [Keymap] Update readme for ploopy nano keymap (#12733)Dustin Bosveld2021-06-141-3/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-147-41/+50
|\|
| * Ensure that safe_commands always run (#13199)Zach White2021-06-147-41/+50