QMK Bot 
								
							 
						 
						
							
							
								
							
							
	7599cd4e50  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-16 00:14:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nico 
								
							 
						 
						
							
							
								
							
							
	
	
	1e5962adbf 
 
						 
						
							
							
								
								
								[Keyboard] Add Specskeys support ( #12813 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-05-15 17:14:19 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	de2294413f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-16 00:09:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Jen 
								
							 
						 
						
							
							
								
							
							
	
	
	430cd6dbc2 
 
						 
						
							
							
								
								
								[Keyboard] Added Bolsa Supply Midway60 Keyboard ( #12747 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-05-15 17:09:16 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	4e32465f06  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-16 00:08:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Jen 
								
							 
						 
						
							
							
								
							
							
	
	
	7ca4608427 
 
						 
						
							
							
								
								
								[Keyboard] Added Lucid KB Scarlet [Maker KB] ( #12748 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-05-15 17:08:49 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ramon Imbao 
								
							 
						 
						
							
							
								
							
							
	
	
	3efaa5ba7c 
 
						 
						
							
							
								
								
								[Keyboard] Add Chevron ( #12762 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-05-15 17:08:25 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	08ec7618a1  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-16 00:05:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brandon Lee 
								
							 
						 
						
							
							
								
							
							
	
	
	60cf7ae8b7 
 
						 
						
							
							
								
								
								[Keyboard] Add Rosa ( #12884 )  
							
							... 
							
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-05-15 17:04:38 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	2bc35205a7  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-15 23:52:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aeonstrife 
								
							 
						 
						
							
							
								
							
							
	
	
	cc77710b4a 
 
						 
						
							
							
								
								
								[Keyboard] Add Potato65 Hotswap keyboard ( #12874 )  
							
							... 
							
							
							
							
							Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-05-15 16:51:21 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	14c0f4e44b  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-15 18:52:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Lam 
								
							 
						 
						
							
							
								
							
							
	
	
	f9a395e265 
 
						 
						
							
							
								
								
								[Keyboard] Add Frusta Fundamental ( #12583 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-05-15 11:52:13 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fauxpark 
								
							 
						 
						
							
							
								
							
							
	d6b707403e  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master' into develop  
							
							
							
							
						 
						
							2021-05-15 13:43:46 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rookiebwoy 
								
							 
						 
						
							
							
								
							
							
	
	
	b057194568 
 
						 
						
							
							
								
								
								[Keyboard] Add Neopad macropad ( #12614 )  
							
							
							
							
						 
						
							2021-05-14 20:09:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ryan 
								
							 
						 
						
							
							
								
							
							
	
	
	83be6ba472 
 
						 
						
							
							
								
								
								Fix Marauder and add readme ( #12906 )  
							
							
							
							
						 
						
							2021-05-14 19:57:16 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	1dca3a8e3a  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 22:44:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cosmin 
								
							 
						 
						
							
							
								
							
							
	
	
	9107c382f3 
 
						 
						
							
							
								
								
								[Keyboard] Add Marauder ( #12550 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-05-14 15:44:00 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Faehriss 
								
							 
						 
						
							
							
								
							
							
	
	
	495d47b7d2 
 
						 
						
							
							
								
								
								[Keyboard] split right shift iso layout for ok60 ( #12890 )  
							
							
							
							
						 
						
							2021-05-14 08:47:38 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Young 
								
							 
						 
						
							
							
								
							
							
	
	
	9c68e27ace 
 
						 
						
							
							
								
								
								TKC Portico: layout macro/Configurator touch-up ( #12897 )  
							
							
							
							
						 
						
							2021-05-14 08:41:02 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									duoshock 
								
							 
						 
						
							
							
								
							
							
	
	
	02e1912371 
 
						 
						
							
							
								
								
								[Keyboard] Add UM-70 ( #12556 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com> 
							
						 
						
							2021-05-14 08:36:31 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dave Vandyke 
								
							 
						 
						
							
							
								
							
							
	
	
	75da5e9742 
 
						 
						
							
							
								
								
								[Keymap] Fix QWERTY/DVORAK status output for kzar keymap ( #12895 )  
							
							
							
							
						 
						
							2021-05-14 08:30:21 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	36a2297deb  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 04:10:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Jen 
								
							 
						 
						
							
							
								
							
							
	
	
	1d50693e1b 
 
						 
						
							
							
								
								
								[Keyboard] Added FJLabs Polaris ( #12746 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com> 
							
						 
						
							2021-05-13 21:10:09 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	16014fe31c  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 03:54:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									csc027 
								
							 
						 
						
							
							
								
							
							
	
	
	937f5fe740 
 
						 
						
							
							
								
								
								[Keymap] csc027/keymap-updates ( #12694 )  
							
							
							
							
						 
						
							2021-05-13 20:54:41 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									studiokestra 
								
							 
						 
						
							
							
								
							
							
	
	
	cae4911ca8 
 
						 
						
							
							
								
								
								[Keyboard] Add Studio Kestra Cascade PCB ( #12704 )  
							
							
							
							
						 
						
							2021-05-13 20:54:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	188bcf7636  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 03:21:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KnoblesseOblige 
								
							 
						 
						
							
							
								
							
							
	
	
	3d6d4bd949 
 
						 
						
							
							
								
								
								[Keyboard] Add Training Wheel 40 ( #12542 )  
							
							
							
							
						 
						
							2021-05-13 20:20:51 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	4a5f575ef4  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 03:12:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brandon 
								
							 
						 
						
							
							
								
							
							
	
	
	5195f97d35 
 
						 
						
							
							
								
								
								[Keyboard] Added smAllice ( #12543 )  
							
							... 
							
							
							
							
							Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> 
							
						 
						
							2021-05-13 20:11:36 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	8bf7a1452d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 03:10:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nathaniel 
								
							 
						 
						
							
							
								
							
							
	
	
	7262d5cc93 
 
						 
						
							
							
								
								
								[Keyboard] update dactyl manuform 4x5 thumb cluster wiring( #12545 )  
							
							
							
							
						 
						
							2021-05-13 20:10:26 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	2fcf761f33  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:48:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cccywj 
								
							 
						 
						
							
							
								
							
							
	
	
	ba66b63fe5 
 
						 
						
							
							
								
								
								[Keyboard] Add fluxlab zplit keyboard ( #12396 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> 
							
						 
						
							2021-05-13 19:48:04 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	70bbcdf084  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:46:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ross Nelson 
								
							 
						 
						
							
							
								
							
							
	
	
	eddd6aa113 
 
						 
						
							
							
								
								
								[Keyboard] Fix Alix40 layout ( #12398 )  
							
							
							
							
						 
						
							2021-05-13 19:45:37 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	178fbdac16  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:40:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brandon Claveria 
								
							 
						 
						
							
							
								
							
							
	
	
	b2a63b42a5 
 
						 
						
							
							
								
								
								[Keyboard] add feels/feels65 ( #12426 )  
							
							... 
							
							
							
							
							Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Swiftrax <swiftrax@gmail.com> 
							
						 
						
							2021-05-13 19:39:56 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	5f9906eccc  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:34:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben 
								
							 
						 
						
							
							
								
							
							
	
	
	8f4603dd73 
 
						 
						
							
							
								
								
								[Keyboard] Add Plaid-Pad Rev3 and oled keymap ( #12464 )  
							
							... 
							
							
							
							
							Co-authored-by: Erovia <Erovia@users.noreply.github.com> 
							
						 
						
							2021-05-13 19:33:36 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	16c4590396  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:22:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									knaruo 
								
							 
						 
						
							
							
								
							
							
	
	
	bfbbb21197 
 
						 
						
							
							
								
								
								[Keyboard] Add pisces keyboard ( #12287 )  
							
							... 
							
							
							
							
							Co-authored-by: Nick Brassel <nick@tzarc.org> 
							
						 
						
							2021-05-13 19:21:49 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	8d85171f16  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:21:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
							
							
	
	
	a6807d1822 
 
						 
						
							
							
								
								
								[Keyboard][PloopyCo] Fix code for Mini and Nano Trackballs ( #12889 )  
							
							
							
							
						 
						
							2021-05-13 19:20:31 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	eeb8ba4e62  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-14 02:00:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									wangyifu 
								
							 
						 
						
							
							
								
							
							
	
	
	f594b22332 
 
						 
						
							
							
								
								
								[Keyboard] 60%  keyboard with ISSI3733RGB IC ( #11559 )  
							
							... 
							
							
							
							
							Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org> 
							
						 
						
							2021-05-13 19:00:45 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daveyr 
								
							 
						 
						
							
							
								
							
							
	
	
	0aaddf697f 
 
						 
						
							
							
								
								
								[Keyboard] added yampad configuration to keyboard subfolder ( #10112 )  
							
							... 
							
							
							
							
							* added yampad configuration to keyboard subfolder
* Update keyboards/yampad/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* added debouncing algorithm, delay and a traditional layout
* added link to readme
* some missed conflicts resolved in readme and rule
* Update readme.md
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/yampad/keymaps/traditional/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/yampad.c
As suggested
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update readme.md
Updated per suggestion
* Update keymap.c
Add MIT licence
* Update keymap.c
Added MIT licence to the traditional layout.
* Update keyboards/yampad/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/yampad/yampad.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/yampad/yampad.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* make cases numerical in .c file
* corrected the bootloader in rules.mk
* Update keyboards/yampad/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Richard <davey.richard@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> 
							
						 
						
							2021-05-13 19:00:25 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									QMK Bot 
								
							 
						 
						
							
							
								
							
							
	19810f4a8b  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master' into develop  
							
							
							
							
						 
						
							2021-05-13 18:08:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Eiden 
								
							 
						 
						
							
							
								
							
							
	
	
	cef1d19a6c 
 
						 
						
							
							
								
								
								[Keymap] Own/dactyl ( #12624 )  
							
							
							
							
						 
						
							2021-05-13 11:07:42 -07:00