Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	2e3834edea  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master' into makefile_overhaul  
							
							
							
							
						 
						
							2016-08-24 10:37:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	7c9fff59d0  
						 
						
							
							
								
								
								Fix slight inconsistency  
							
							... 
							
							
							
							
							When running make from either a keyboard folder or a subproject
it runs all keymaps for all subprojects and the selected subproject
respectively. Without this fix, the same doesn't happen if your
run make clean for example. As it would just provide you with an
error message. Now this will work as expected. 
							
						 
						
							2016-08-24 10:29:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	a902206735  
						 
						
							
							
								
								
								Nightly  
							
							... 
							
							
							
							
							Prep for Vision build 
							
						 
						
							2016-08-23 23:05:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	5d685efa49  
						 
						
							
							
								
								
								Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev  
							
							
							
							
						 
						
							2016-08-23 20:53:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	9263ade0fb  
						 
						
							
							
								
								
								Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
							
							
							
							
						 
						
							2016-08-23 20:52:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	6c2b7f359c  
						 
						
							
							
								
								
								Fixed line ending  
							
							
							
							
						 
						
							2016-08-23 20:47:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	3f8672287f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
							
							
							
							
						 
						
							2016-08-23 20:45:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dbroqua 
								
							 
						 
						
							
							
								
							
							
	d19c0d46d9  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
							
						 
						
							2016-08-23 20:39:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	a920548471  
						 
						
							
							
								
								
								Merge pull request  #677  from SmackleFunky/master  
							
							... 
							
							
							
							
							Virtual Serial Port - and a Layout that uses that virtual serial port for Plover 
							
						 
						
							2016-08-23 11:05:26 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dbroqua 
								
							 
						 
						
							
							
								
							
							
	e65252d591  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							... 
							
							
							
							
							# Conflicts:
#	keyboards/planck/keymaps/dbroqua/keymap.c 
							
						 
						
							2016-08-23 13:39:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									René Werner 
								
							 
						 
						
							
							
								
							
							
	6a61c89477  
						 
						
							
							
								
								
								added my personal keymap  
							
							... 
							
							
							
							
							I ported my keymap from tmk to QMK. 
							
						 
						
							2016-08-23 13:20:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									René Werner 
								
							 
						 
						
							
							
								
							
							
	d28942f5d7  
						 
						
							
							
								
								
								Merge branch 'kitten_paw'  
							
							
							
							
						 
						
							2016-08-23 12:17:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									René Werner 
								
							 
						 
						
							
							
								
							
							
	06c82a063b  
						 
						
							
							
								
								
								Fixed wrong keycode in default keymap  
							
							... 
							
							
							
							
							Where I used KC_MENU I should have used KC_APP instead. 
							
						 
						
							2016-08-23 12:15:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
								
							
							
	7009112752  
						 
						
							
							
								
								
								move to ergodox-ez only  
							
							
							
							
						 
						
							2016-08-23 07:04:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	feebc58d32  
						 
						
							
							
								
								
								Split kitten_paw into Makefile/rules.mk  
							
							
							
							
						 
						
							2016-08-23 09:42:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	8f2af3c6bc  
						 
						
							
							
								
								
								Merge branch 'master' into makefile_overhaul  
							
							
							
							
						 
						
							2016-08-23 09:38:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
								
							
							
	104ca8a5e1  
						 
						
							
							
								
								
								Remove unneeded include  
							
							
							
							
						 
						
							2016-08-23 04:49:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
								
							
							
	ec62cbe384  
						 
						
							
							
								
								
								add missing #include  
							
							
							
							
						 
						
							2016-08-23 04:32:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	fb4452c2f5  
						 
						
							
							
								
								
								Merge pull request  #671  from Talljoe/one-hand  
							
							... 
							
							
							
							
							Add native one-handed support 
							
						 
						
							2016-08-23 00:29:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	57125ce790  
						 
						
							
							
								
								
								Merge pull request  #673  from coderkun/master  
							
							... 
							
							
							
							
							Add method to set Unicode input key for ISO 14755 
							
						 
						
							2016-08-23 00:28:01 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	3824fa0014  
						 
						
							
							
								
								
								Merge pull request  #675  from Xyverz/master  
							
							... 
							
							
							
							
							Added missing item K3A to KEYMAP() variable in tv44.h 
							
						 
						
							2016-08-23 00:27:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9ca4c9f57f  
						 
						
							
							
								
								
								Merge pull request  #676  from ickerwx/kitten_paw  
							
							... 
							
							
							
							
							Added support for the Kitten Paw controller 
							
						 
						
							2016-08-23 00:26:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
								
							
							
	86656690f1  
						 
						
							
							
								
								
								TxBolt (Steno) Serial protocol for Ergodox Ez  
							
							
							
							
						 
						
							2016-08-23 04:17:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Green 
								
							 
						 
						
							
							
								
							
							
	80d10bef07  
						 
						
							
							
								
								
								Added USB Virtual Serial support  
							
							
							
							
						 
						
							2016-08-23 04:16:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dbroqua 
								
							 
						 
						
							
							
								
							
							
	92fe78a5ea  
						 
						
							
							
								
								
								- Added PrintScreen key on multimedia layer  
							
							
							
							
						 
						
							2016-08-22 21:19:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									René Werner 
								
							 
						 
						
							
							
								
							
							
	a26ee57eb8  
						 
						
							
							
								
								
								Added support for the Kitten Paw controller  
							
							... 
							
							
							
							
							This adds support for the 2016 revision of the Kitten Paw [1] replacement
controller by Bathroom Epiphanies.
[1] http://bathroomepiphanies.com/controllers/  
							
						 
						
							2016-08-22 20:34:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cbbrowne 
								
							 
						 
						
							
							
								
							
							
	90abe70586  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-08-22 13:16:49 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean Reifschneider 
								
							 
						 
						
							
							
								
							
							
	0418ecc073  
						 
						
							
							
								
								
								Changes from review by @fredizzimo and @Xyverz  
							
							
							
							
						 
						
							2016-08-22 10:26:18 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	705c775a4a  
						 
						
							
							
								
								
								Nightly  
							
							... 
							
							
							
							
							Only major change to qmk was the addition of A0-A7 pins for the AT90USB 
							
						 
						
							2016-08-21 22:05:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Xyverz 
								
							 
						 
						
							
							
								
							
							
	02f4e5b064  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
							
						 
						
							2016-08-21 19:02:32 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Xyverz 
								
							 
						 
						
							
							
								
							
							
	364b77563c  
						 
						
							
							
								
								
								Added missing key K3A to KEYMAP() macro in tv44.h  
							
							
							
							
						 
						
							2016-08-21 18:59:10 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	d8c5041f0a  
						 
						
							
							
								
								
								Merge pull request  #669  from fredizzimo/windows10_build_instructions  
							
							... 
							
							
							
							
							Add instructions for Windows 10 subsystem for Linux 
							
						 
						
							2016-08-21 19:13:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	fa18e62d37  
						 
						
							
							
								
								
								Merge pull request  #668  from fredizzimo/line_endings  
							
							... 
							
							
							
							
							Enforce correct line endings 
							
						 
						
							2016-08-21 19:13:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	7c140538c7  
						 
						
							
							
								
								
								Merge pull request  #674  from kyleberry/master  
							
							... 
							
							
							
							
							Fixing Dvorak 
							
						 
						
							2016-08-21 19:09:26 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dbroqua 
								
							 
						 
						
							
							
								
							
							
	d7b6d74842  
						 
						
							
							
								
								
								- Inverted key Tab and Esc  
							
							... 
							
							
							
							
							- Reorganised bottom row 
							
						 
						
							2016-08-21 23:20:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kyle Berry 
								
							 
						 
						
							
							
								
							
							
	30de8663a9  
						 
						
							
							
								
								
								Fixing Dvorak  
							
							... 
							
							
							
							
							Updating with proper Dvorak layout. 
							
						 
						
							2016-08-21 14:01:43 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	81594c7883  
						 
						
							
							
								
								
								Drop method to set Unicode input key and declare start and finish methods as “weak” instead  
							
							
							
							
						 
						
							2016-08-21 21:02:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									coderkun 
								
							 
						 
						
							
							
								
							
							
	dffdeb50b7  
						 
						
							
							
								
								
								Add method to set Unicode input key for ISO 14755  
							
							... 
							
							
							
							
							https://github.com/jackhumbert/qmk_firmware/issues/672  
						
							2016-08-21 20:27:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	8f16403179  
						 
						
							
							
								
								
								Change order of variable assignment  
							
							... 
							
							
							
							
							BUILD_DIR and TARGET was assigned too late, so the dfu-util target,
which depends on them did not work. 
							
						 
						
							2016-08-21 13:53:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	1c69acb7d5  
						 
						
							
							
								
								
								Add longest match to the rule-checking  
							
							... 
							
							
							
							
							This fixes cases where you have several keyboards with a common
prefix, like algernon, and algernon-master 
							
						 
						
							2016-08-21 13:10:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
								
							
							
	c20bf83afd  
						 
						
							
							
								
								
								Add one-hand key to planck/experimental keymap.  
							
							
							
							
						 
						
							2016-08-20 18:47:06 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
								
							
							
	66adbfcab5  
						 
						
							
							
								
								
								Add default swap configs for a couple of boards.  
							
							
							
							
						 
						
							2016-08-20 17:46:53 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
								
							
							
	8090f6b499  
						 
						
							
							
								
								
								Improve one-hand support by adding more actions and tap keys.  
							
							
							
							
						 
						
							2016-08-20 17:46:53 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joe Wasson 
								
							 
						 
						
							
							
								
							
							
	dd37860160  
						 
						
							
							
								
								
								Add one-hand support.  
							
							... 
							
							
							
							
							This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information. 
							
						 
						
							2016-08-20 17:46:53 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	4807feec8a  
						 
						
							
							
								
								
								In Progress Merge  
							
							
							
							
						 
						
							2016-08-20 14:49:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Olivier 
								
							 
						 
						
							
							
								
							
							
	b5172e3afa  
						 
						
							
							
								
								
								Rename file following upstream folder rename.  
							
							
							
							
						 
						
							2016-08-20 18:19:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	2a5bdd81d4  
						 
						
							
							
								
								
								Add warning about line endings  
							
							
							
							
						 
						
							2016-08-20 19:11:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Olivier 
								
							 
						 
						
							
							
								
							
							
	009ab77d3e  
						 
						
							
							
								
								
								Merge  https://github.com/jackhumbert/qmk_firmware  
							
							
							
							
						 
						
							2016-08-20 18:07:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	704cbd1d2b  
						 
						
							
							
								
								
								Add instructions for Windows 10 subsystem for Linux  
							
							... 
							
							
							
							
							Also simplify the linux instructions 
							
						 
						
							2016-08-20 19:02:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	5febdb0a3c  
						 
						
							
							
								
								
								Initial Commmit  
							
							
							
							
						 
						
							2016-08-20 10:26:36 -05:00