summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move to correct location (#14171)Joel Challis2021-08-262-0/+0
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-261-1/+1
|\
| * Skeletn87 - Fix RGB pin (#14170)kb-elmo2021-08-261-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-259-0/+442
|\|
| * [keyboard] Add 0x3E (#14088)Charles2021-08-269-0/+442
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-251-1/+1
|\|
| * [converter/a1200] Changing layout macro reference info.json (#14143)8bits4ever2021-08-261-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-254-0/+317
|\|
| * [Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137)MechMaster482021-08-254-0/+317
* | Move nix folder alongside vagrant (#14132)Joel Challis2021-08-255-2/+2
* | Revert 14083 && 14144 (#14150)Joel Challis2021-08-258-118/+104
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-241-9/+9
|\|
| * [Keyboard] Update Technik ortholinear RGB matrix points (#14124)Albert Y2021-08-241-9/+9
* | Fix merge artifacts (#14146)Joel Challis2021-08-245-0/+0
* | Align some quantum sub-directories (#14134)Joel Challis2021-08-2417-13/+6
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2411-0/+426
|\|
| * [Keyboard] Add yoichiro/lunakey_macro (#13849)Yoichiro Tanaka2021-08-2411-0/+426
* | Short term bodge for firmware size bloat (#14144)Joel Challis2021-08-243-4/+21
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-2454-288/+2135
|\|
| * [Keyboard] Add serneity65 (#13889)GG2021-08-2419-0/+945
| * [Keyboard] Fix keyprez qmk configurator (#14119)Christian Sandven2021-08-242-81/+89
| * [Keyboard] Add QEZ keyboard (#14131)kb-elmo2021-08-249-0/+374
| * [Keyboard] Update Technik staggered RGB matrix points (#14125)Albert Y2021-08-241-9/+9
| * [Keyboard] Update info.json for ocean/gin_v2 (#14121)Rifaa Subekti2021-08-241-6/+68
| * [Keyboard] Fix default keymap for quark squared keyboard (#14139)Drashna Jaelre2021-08-241-1/+1
| * Remove more unused files (#14135)Joel Challis2021-08-242-24/+0
| * [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)lalalademaxiya12021-08-2320-171/+653
* | add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)Takeshi ISHII2021-08-242-5/+8
* | Tidy up quantum.c now some of tmk_core has been merged (#14083)Joel Challis2021-08-246-101/+98
* | fix (#14142)Xelus222021-08-241-1/+1
* | [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)stickandgum2021-08-242-11/+10
* | [Keymap] Drashna keymap fixups (#14140)Drashna Jaelre2021-08-247-27/+21
* | [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-24500-1387/+1579
* | Fix Mouse Shared EP functionality (#14136)Drashna Jaelre2021-08-242-3/+4
* | Fix bootloadHID comments breaking :flash (#14133)Drashna Jaelre2021-08-231-2/+2
* | eeprom_stm32: implement high density wear leveling (#12567)Donald Kjer2021-08-2312-177/+1529
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-232-2/+2
|\|
| * Fix US_RDQU keycode (#13464)Olli Helenius2021-08-242-2/+2
* | adding uf2 flash support for blackpill 401 (#13968)Path Nirvana2021-08-244-2/+183
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-232-2/+2
|\|
| * [Keyboard] update default and via keymap for ocean/wang_v2 (#14122)Rifaa Subekti2021-08-232-2/+2
* | Fixup line endings.Nick Brassel2021-08-232-139/+139
* | [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)stickandgum2021-08-224-0/+441
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-231-10/+13
|\|
| * [Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c (#14094)Vino Rodrigues2021-08-221-10/+13
* | Fix typo (#14118)Dasky2021-08-231-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-221-1/+1
|\|
| * Add fix for brew upgrade (#12921)Bror Winther2021-08-221-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-221-15/+15
|\|
| * Fix line endings for `quark_squared` info.json (#14113)Ryan2021-08-221-15/+15