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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								2a5bdd81d4 
								
							 
						 
						
							
							
								
								Add warning about line endings  
							
							 
							
							
							
						 
						
							2016-08-20 19:11:22 +03: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  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								a3f726174c 
								
							 
						 
						
							
							
								
								Merge pull request  #665  from linsomniac/keymap_jafo  
							
							 
							
							... 
							
							
							
							Adding jafo layout. 
							
						 
						
							2016-08-20 11:04:54 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								a592c9dcf4 
								
							 
						 
						
							
							
								
								Merge pull request  #658  from Xyverz/master  
							
							 
							
							... 
							
							
							
							Got rid of all the kludge in my ErgoDox keymap. 
							
						 
						
							2016-08-20 11:04:02 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								7cef0f56e9 
								
							 
						 
						
							
							
								
								Merge pull request  #630  from nrrkeene/master  
							
							 
							
							... 
							
							
							
							The Ordinary Layout is the unsurprising layout 
							
						 
						
							2016-08-20 11:01:22 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								fd2f957a1a 
								
							 
						 
						
							
							
								
								Normalize line endings  
							
							 
							
							
							
						 
						
							2016-08-20 17:59:18 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								f0fd840a57 
								
							 
						 
						
							
							
								
								Add .gitattributes to ensure correct line endings  
							
							 
							
							... 
							
							
							
							It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash 
							
						 
						
							2016-08-20 17:27:51 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								b26ded3ab1 
								
							 
						 
						
							
							
								
								Comment the Makefile  
							
							 
							
							... 
							
							
							
							Also move some messages to message.mk 
							
						 
						
							2016-08-20 14:53:29 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								48f8ab1ae2 
								
							 
						 
						
							
							
								
								Fix the clean target  
							
							 
							
							... 
							
							
							
							It now properly cleans all the outputs 
							
						 
						
							2016-08-20 12:44:04 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xyverz 
								
							 
						 
						
							
							
							
							
								
							
							
								70d4ea7904 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2016-08-19 22:50:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xyverz 
								
							 
						 
						
							
							
							
							
								
							
							
								e4984f65de 
								
							 
						 
						
							
							
								
								Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.  
							
							 
							
							
							
						 
						
							2016-08-19 22:45:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xyverz 
								
							 
						 
						
							
							
							
							
								
							
							
								aff792545d 
								
							 
						 
						
							
							
								
								Changed my keymap to match normal keymaps.  
							
							 
							
							
							
						 
						
							2016-08-19 22:30:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
							
							
								
							
							
								6a9a6b9477 
								
							 
						 
						
							
							
								
								The Ordinary Layout is boring because all the keys are where you expect them to be  
							
							 
							
							
							
						 
						
							2016-08-19 23:44:08 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
							
							
								
							
							
								8f78ba1f73 
								
							 
						 
						
							
							
								
								The Ordinary Layout is boring because all the keys are where you expect them to be  
							
							 
							
							
							
						 
						
							2016-08-19 23:38:13 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sean Reifschneider 
								
							 
						 
						
							
							
							
							
								
							
							
								a25480b3b5 
								
							 
						 
						
							
							
								
								Bringing over changes from default map.  
							
							 
							
							
							
						 
						
							2016-08-19 20:55:50 -06:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								da226e6126 
								
							 
						 
						
							
							
								
								Update keyboard readme files with new makefile instructions  
							
							 
							
							
							
						 
						
							2016-08-20 03:56:48 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								b4c75569b0 
								
							 
						 
						
							
							
								
								Update readme with new instructions for make  
							
							 
							
							
							
						 
						
							2016-08-20 03:56:47 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								e1243339ca 
								
							 
						 
						
							
							
								
								Add diffutils to travis.yml and install_dependencies  
							
							 
							
							... 
							
							
							
							It has been required for a while now, and now actually checked in
the makefiles. Before, if you didn't have it installed it would
just recompile everything.
The readme hasn't been updated to reflect this, I think we need
to go through that separately, and see what's really needed. Or
just instruct people to run the batch scripts. 
							
						 
						
							2016-08-20 03:56:46 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4d7adbb9 
								
							 
						 
						
							
							
								
								Fix the template for the Makefile/rules.mk split  
							
							 
							
							
							
						 
						
							2016-08-20 03:56:45 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								f29730da36 
								
							 
						 
						
							
							
								
								Better format for non-silent output  
							
							 
							
							
							
						 
						
							2016-08-20 03:56:44 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
							
							
								
							
							
								03e31ef8b9 
								
							 
						 
						
							
							
								
								Continue on error  
							
							 
							
							
							
						 
						
							2016-08-20 03:56:43 +03:00