Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							6186de5828 
							
						 
					 
					
						
						
							
							Merge pull request  #227  from NoahAndrews/patch-4  
						
						... 
						
						
						
						Fixed minor issues with Preonic readme 
						
						
					 
					
						2016-03-30 11:07:00 -04:00 
						 
				 
			
				
					
						
							
							
								Miha Rekar 
							
						 
					 
					
						
						
						
						
							
						
						
							3b703eff33 
							
						 
					 
					
						
						
							
							Tiny fix of Planck diagrams  
						
						
						
						
					 
					
						2016-03-30 17:03:03 +02:00 
						 
				 
			
				
					
						
							
							
								Noah Andrews 
							
						 
					 
					
						
						
						
						
							
						
						
							09d567045c 
							
						 
					 
					
						
						
							
							Fixed minor issues with Preonic readme  
						
						
						
						
					 
					
						2016-03-30 09:17:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							47b537c87f 
							
						 
					 
					
						
						
							
							preonic readme  
						
						
						
						
					 
					
						2016-03-30 00:46:45 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							e7377dc24b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/tmk_keyboard  
						
						
						
						
					 
					
						2016-03-30 00:45:48 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							b8ac509570 
							
						 
					 
					
						
						
							
							.hex files  
						
						
						
						
					 
					
						2016-03-30 00:45:37 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							ac0729787f 
							
						 
					 
					
						
						
							
							preonic update  
						
						
						
						
					 
					
						2016-03-30 00:43:07 -04:00 
						 
				 
			
				
					
						
							
							
								Noah Andrews 
							
						 
					 
					
						
						
						
						
							
						
						
							95fba250ef 
							
						 
					 
					
						
						
							
							Updated several keyboard folders to use new keymap naming scheme  
						
						
						
						
					 
					
						2016-03-29 21:53:36 -04:00 
						 
				 
			
				
					
						
							
							
								Noah Andrews 
							
						 
					 
					
						
						
						
						
							
						
						
							2ae44470e0 
							
						 
					 
					
						
						
							
							Fix error in Planck makefile comment  
						
						... 
						
						
						
						[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc ) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken. 
						
						
					 
					
						2016-03-29 12:06:32 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							4a43c56844 
							
						 
					 
					
						
						
							
							Merge pull request  #216  from msc654/master  
						
						... 
						
						
						
						Added msc keymap for ergodox_ez 
						
						
					 
					
						2016-03-28 22:40:58 +03:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							fd9e5d1510 
							
						 
					 
					
						
						
							
							Merge pull request  #214  from cdlm/action-hook  
						
						... 
						
						
						
						Add per-event user hook function 
						
						
					 
					
						2016-03-28 11:55:19 -04:00 
						 
				 
			
				
					
						
							
							
								Damien Pollet 
							
						 
					 
					
						
						
						
						
							
						
						
							bcebb3447c 
							
						 
					 
					
						
						
							
							Add action-preprocessing kb/user hooks in planck  
						
						
						
						
					 
					
						2016-03-28 16:49:47 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Carroll 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ce133203 
							
						 
					 
					
						
						
							
							Corrected duplicate image issue  
						
						
						
						
					 
					
						2016-03-28 06:00:05 -04:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							577971ab07 
							
						 
					 
					
						
						
							
							Magic Key Overrides / Keyboard Lock / Forced NKRO  
						
						... 
						
						
						
						Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default) 
						
						
					 
					
						2016-03-28 00:03:21 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Carroll 
							
						 
					 
					
						
						
						
						
							
						
						
							beda4e6fd3 
							
						 
					 
					
						
						
							
							Added msc keymap for ergodox_ez  
						
						
						
						
					 
					
						2016-03-27 23:51:11 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							16da54cfa0 
							
						 
					 
					
						
						
							
							Merge pull request  #211  from nrrkeene/master  
						
						... 
						
						
						
						The Ordinary Layout is unremarkably mundane and remarkably useful 
						
						
					 
					
						2016-03-27 09:10:05 +03:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							6a31d92276 
							
						 
					 
					
						
						
							
							Merge pull request  #196  from naps62/naps62  
						
						... 
						
						
						
						Adds naps62's Ergodox EZ layout 
						
						
					 
					
						2016-03-27 09:08:23 +03:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							e43c0c649d 
							
						 
					 
					
						
						
							
							Merge  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-03-26 00:44:20 -05:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							97c4c790cc 
							
						 
					 
					
						
						
							
							The Ordinary Layout is unremarkably mundane and remarkably useful  
						
						
						
						
					 
					
						2016-03-26 00:40:54 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							c9aec8bc24 
							
						 
					 
					
						
						
							
							Merge pull request  #207  from romanzolotarev/master  
						
						... 
						
						
						
						Add important note about brightness on OS X 
						
						
					 
					
						2016-03-25 19:37:42 +03:00 
						 
				 
			
				
					
						
							
							
								Nicholas Keene 
							
						 
					 
					
						
						
						
						
							
						
						
							d7a1fc81a0 
							
						 
					 
					
						
						
							
							The Ordinary Layout is familiar to users of common keyboards  
						
						
						
						
					 
					
						2016-03-24 23:10:21 -05:00 
						 
				 
			
				
					
						
							
							
								Norberto Monarrez 
							
						 
					 
					
						
						
						
						
							
						
						
							a5a40a0703 
							
						 
					 
					
						
						
							
							Edited to work with jackhumbert/qmk_firmware pull  #190  
						
						... 
						
						
						
						Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)" 
						
						
					 
					
						2016-03-23 13:42:34 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							95b0032142 
							
						 
					 
					
						
						
							
							Merge pull request  #209  from n0bs/master  
						
						... 
						
						
						
						Added project folder for Bantam-44 
						
						
					 
					
						2016-03-23 10:45:16 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							02096f78e5 
							
						 
					 
					
						
						
							
							Merge pull request  #200  from alexives/add_diagram_to_planck_layout  
						
						... 
						
						
						
						Added layout diagrams to the default planck keymap 
						
						
					 
					
						2016-03-23 10:44:31 -04:00 
						 
				 
			
				
					
						
							
							
								Norberto Monarrez 
							
						 
					 
					
						
						
						
						
							
						
						
							d0c894cfae 
							
						 
					 
					
						
						
							
							Added files for Bantam-44  
						
						
						
						
					 
					
						2016-03-23 10:22:43 -04:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							10491ba21f 
							
						 
					 
					
						
						
							
							Fixed LED Function Calls  
						
						... 
						
						
						
						Fixed LED indicator function calls to match how the matrix init function
calls are formatted. 
						
						
					 
					
						2016-03-22 20:58:44 -05:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							ec62d9e85c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
						
						... 
						
						
						
						# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h 
						
						
					 
					
						2016-03-22 20:39:05 -05:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							3087808790 
							
						 
					 
					
						
						
							
							Add important note about brightness on OS X  
						
						
						
						
					 
					
						2016-03-22 22:33:23 +08:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							baeffd99da 
							
						 
					 
					
						
						
							
							Pull request 190 resolution with 'qmk/master' for merge  
						
						
						
						
					 
					
						2016-03-21 17:18:53 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							7f0d77e08c 
							
						 
					 
					
						
						
							
							Merge pull request  #205  from romanzolotarev/master  
						
						... 
						
						
						
						Add Roman's Layout 
						
						
					 
					
						2016-03-21 21:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							e86f09d262 
							
						 
					 
					
						
						
							
							Merge pull request  #203  from XenoBits/master  
						
						... 
						
						
						
						Improved c# dev layout, only 2 layers now 
						
						
					 
					
						2016-03-20 22:50:56 +02:00 
						 
				 
			
				
					
						
							
							
								Maxime Millet 
							
						 
					 
					
						
						
						
						
							
						
						
							cc0c157287 
							
						 
					 
					
						
						
							
							Fixed png image  
						
						
						
						
					 
					
						2016-03-20 12:54:02 +01:00 
						 
				 
			
				
					
						
							
							
								Maxime Millet 
							
						 
					 
					
						
						
						
						
							
						
						
							895bc327c3 
							
						 
					 
					
						
						
							
							CSharp dev layout V2  
						
						
						
						
					 
					
						2016-03-20 12:50:04 +01:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							a429374b78 
							
						 
					 
					
						
						
							
							Update readme  
						
						
						
						
					 
					
						2016-03-19 17:53:58 +08:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							7138b1e6fc 
							
						 
					 
					
						
						
							
							Update layout  
						
						
						
						
					 
					
						2016-03-19 17:43:02 +08:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c265aace 
							
						 
					 
					
						
						
							
							Swap volup and voldown  
						
						
						
						
					 
					
						2016-03-18 17:55:21 +08:00 
						 
				 
			
				
					
						
							
							
								Roman Zolotarev 
							
						 
					 
					
						
						
						
						
							
						
						
							bbe553dba3 
							
						 
					 
					
						
						
							
							Add Roman's Layout  
						
						... 
						
						
						
						Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW. 
						
						
					 
					
						2016-03-18 12:14:03 +08:00 
						 
				 
			
				
					
						
							
							
								Maciej Piechotka 
							
						 
					 
					
						
						
						
						
							
						
						
							cf986ba504 
							
						 
					 
					
						
						
							
							Add waits to prevent KVM from hanging  
						
						
						
						
					 
					
						2016-03-17 08:18:03 -07:00 
						 
				 
			
				
					
						
							
							
								Maciej Piechotka 
							
						 
					 
					
						
						
						
						
							
						
						
							fb3b7f32c0 
							
						 
					 
					
						
						
							
							Put frequently used keys in shell (-=) under thumb  
						
						
						
						
					 
					
						2016-03-17 08:18:03 -07:00 
						 
				 
			
				
					
						
							
							
								Maciej Piechotka 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8f4ff957 
							
						 
					 
					
						
						
							
							Add missing breaks in mpiechotka ergodox_ez keyboard  
						
						
						
						
					 
					
						2016-03-17 08:18:03 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Ives 
							
						 
					 
					
						
						
						
						
							
						
						
							05b0931cfc 
							
						 
					 
					
						
						
							
							Added layout diagrams to the default planck keymap  
						
						... 
						
						
						
						Signed-off-by: Alex Ives <alex@ives.mn> 
						
						
					 
					
						2016-03-16 22:58:17 -05:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2457d753 
							
						 
					 
					
						
						
							
							Adding Retro_Refit Keyboard  
						
						... 
						
						
						
						Retro_Refit is an example of using a Teensy to replace a keyboard
controller on an older keyboard. The original 6x15 keyboard had a
non-standard 11x8 matrix. 
						
						
					 
					
						2016-03-16 10:27:04 -05:00 
						 
				 
			
				
					
						
							
							
								Miguel Palhas 
							
						 
					 
					
						
						
						
						
							
						
						
							8aa559b825 
							
						 
					 
					
						
						
							
							Adds naps62's layout  
						
						
						
						
					 
					
						2016-03-15 11:40:15 +00:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							b8d4af8d4a 
							
						 
					 
					
						
						
							
							Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build  
						
						
						
						
					 
					
						2016-03-14 13:19:29 -04:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							58bbfc5fa6 
							
						 
					 
					
						
						
							
							PR190hotfix.sh, fresh hexes, makeallhex.sh script  
						
						
						
						
					 
					
						2016-03-11 11:16:19 -05:00 
						 
				 
			
				
					
						
							
							
								Mitch Lloyd 
							
						 
					 
					
						
						
						
						
							
						
						
							67624d0b61 
							
						 
					 
					
						
						
							
							First keyboard layout  
						
						
						
						
					 
					
						2016-03-10 17:20:08 -08:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							641859df84 
							
						 
					 
					
						
						
							
							Addressed void* return warning in all keymaps  
						
						
						
						
					 
					
						2016-03-10 11:28:34 -05:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							191488b96f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qmk/master' into windocs  
						
						
						
						
					 
					
						2016-03-10 10:50:17 -05:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							79e0d7cbc3 
							
						 
					 
					
						
						
							
							Cygwin Based Users Guide v0.5 -further corrections  
						
						
						
						
					 
					
						2016-03-09 15:53:37 -05:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfb9d17cf 
							
						 
					 
					
						
						
							
							Cygwin Based Users Guide v0.4 -corrections/dfu build  
						
						
						
						
					 
					
						2016-03-09 12:16:03 -05:00