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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Browne 
								
							 
						 
						
							
							
								
							
							
	a4ff9f2567  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-03-22 17:29:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	403d756ad5  
						 
						
							
							
								
								
								Merge pull request  #190  from yoyoerx/function_pointers  
							
							... 
							
							
							
							
							Addressing void* return warning & coding style 
							
						 
						
							2016-03-22 21:30:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	5872f80c96  
						 
						
							
							
								
								
								Merge pull request  #2  from jackhumbert/master  
							
							... 
							
							
							
							
							Update my repo to upstream 
							
						 
						
							2016-03-22 10:38:03 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	4a7e131604  
						 
						
							
							
								
								
								Meh -> Hyper  
							
							
							
							
						 
						
							2016-03-22 07:43:28 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	84647efebb  
						 
						
							
							
								
								
								Update readme.md  
							
							
							
							
						 
						
							2016-03-22 07:42:47 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	c1a520fb81  
						 
						
							
							
								
								
								Added photo  
							
							
							
							
						 
						
							2016-03-22 07:36:40 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	d1f446962a  
						 
						
							
							
								
								
								Added real life layout  
							
							
							
							
						 
						
							2016-03-22 07:34:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Zolotarev 
								
							 
						 
						
							
							
								
							
							
	3087808790  
						 
						
							
							
								
								
								Add important note about brightness on OS X  
							
							
							
							
						 
						
							2016-03-22 22:33:23 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	55fa66428c  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-03-22 15:00:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	4687162470  
						 
						
							
							
								
								
								Added Readme  
							
							
							
							
						 
						
							2016-03-21 21:43:59 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	f6e5e2bd45  
						 
						
							
							
								
								
								added .hex  
							
							
							
							
						 
						
							2016-03-21 20:59:06 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	cffd91edbd  
						 
						
							
							
								
								
								typos  
							
							
							
							
						 
						
							2016-03-21 20:58:29 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	f744e860ff  
						 
						
							
							
								
								
								Update keymap.c  
							
							
							
							
						 
						
							2016-03-21 20:51:05 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	65fde3cc12  
						 
						
							
							
								
								
								More updates  
							
							
							
							
						 
						
							2016-03-21 16:03:25 -07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johnstone 
								
							 
						 
						
							
							
								
							
							
	af9e9810a0  
						 
						
							
							
								
								
								work in progress  
							
							
							
							
						 
						
							2016-03-20 22:05:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	1313e0c828  
						 
						
							
							
								
								
								fix number pad, add ,  
							
							
							
							
						 
						
							2016-03-20 23:07:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	7ebc813e82  
						 
						
							
							
								
								
								changing cursor keys, back to "default" cursor key layout, adding ISO-cursor keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though  
							
							
							
							
						 
						
							2016-03-20 23:00:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	d0c62feb7e  
						 
						
							
							
								
								
								tweaking it a bit further, fixing things  
							
							
							
							
						 
						
							2016-03-20 22:53:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	64495d11ba  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-03-20 22:07:53 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	ed830f2a13  
						 
						
							
							
								
								
								Merge pull request  #201  from uzytkownik/master  
							
							... 
							
							
							
							
							Further improvements to mpiechotka keyboard 
							
						 
						
							2016-03-20 22:28:21 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	17628e9922  
						 
						
							
							
								
								
								Removing Teensy SDK Folder  
							
							... 
							
							
							
							
							Fixing Github GUI error "fatal: no submodule mapping found in
.gitmodules for path 'teensy-sdk'" 
							
						 
						
							2016-03-16 09:53:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	eba9a7d74d  
						 
						
							
							
								
								
								Adding LED function pointers  
							
							
							
							
						 
						
							2016-03-15 23:52:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wojciech Siewierski 
								
							 
						 
						
							
							
								
							
							
	a5cdc3aab1  
						 
						
							
							
								
								
								Expose the pressed_actions_cache global variable  
							
							
							
							
						 
						
							2016-03-15 16:51:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wojciech Siewierski 
								
							 
						 
						
							
							
								
							
							
	73cb87740b  
						 
						
							
							
								
								
								Always provide an implementation of process_action_nocache  
							
							
							
							
						 
						
							2016-03-15 16:03:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Miguel Palhas 
								
							 
						 
						
							
							
								
							
							
	8aa559b825  
						 
						
							
							
								
								
								Adds naps62's layout  
							
							
							
							
						 
						
							2016-03-15 11:40:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	35393fa9dc  
						 
						
							
							
								
								
								Merge pull request  #194  from DidierLoiseau/bépo-keymap-header  
							
							... 
							
							
							
							
							Keymap header for the BÉPO layout 
							
						 
						
							2016-03-14 13:42:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	914f1d6f98  
						 
						
							
							
								
								
								Merge pull request  #195  from krid78/master  
							
							... 
							
							
							
							
							fixes an obvious typo to have DE_LCBR produce { 
							
						 
						
							2016-03-14 13:42:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	f2cf3f3028  
						 
						
							
							
								
								
								Merge pull request  #197  from yoyoerx/windocs  
							
							... 
							
							
							
							
							Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build 
							
						 
						
							2016-03-14 13:37:10 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									yoyoerx 
								
							 
						 
						
							
							
								
							
							
	b8d4af8d4a  
						 
						
							
							
								
								
								Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build  
							
							
							
							
						 
						
							2016-03-14 13:19:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Kriesten 
								
							 
						 
						
							
							
								
							
							
	bfc6eca44a  
						 
						
							
							
								
								
								fixes an obvious typo to have DE_LCBR produce {  
							
							
							
							
						 
						
							2016-03-14 13:35:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Didier Loiseau 
								
							 
						 
						
							
							
								
							
							
	7c33f8493f  
						 
						
							
							
								
								
								Keymap header for the BÉPO layout  
							
							
							
							
						 
						
							2016-03-13 23:22:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	59657355d2  
						 
						
							
							
								
								
								Master mode remains active  
							
							... 
							
							
							
							
							It remains active even if the USB link is suspended or otherwise
temporarilly goes down. 
							
						 
						
							2016-03-13 21:38:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	f4c11740f7  
						 
						
							
							
								
								
								Suspend power off, fix backlight animation  
							
							... 
							
							
							
							
							The backlight color animation was using the wrong frame number, so
it didn't work properly. 
							
						 
						
							2016-03-13 21:35:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	b93d07198a  
						 
						
							
							
								
								
								Suspend support for the visualizer  
							
							
							
							
						 
						
							2016-03-13 20:13:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wojciech Siewierski 
								
							 
						 
						
							
							
								
							
							
	20dd9c0326  
						 
						
							
							
								
								
								process_action may be called either with key cache or without it  
							
							... 
							
							
							
							
							If one wants to temporarily disable the key cache (for example because
it interferes with a macro), `disable_action_cache` must be set to
`true`. `process_action_nocache` is a simple wrapper doing just that for
a single call. 
							
						 
						
							2016-03-13 00:18:20 +01:00