Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							36df9fd3fd 
							
						 
					 
					
						
						
							
							Merge pull request  #568  from sethbc/fix-colemak-osx-pc-no  
						
						... 
						
						
						
						update NO_AMP to NO_AMPR 
						
						
					 
					
						2016-07-28 12:26:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							f96a2a74ea 
							
						 
					 
					
						
						
							
							Merge pull request  #566  from SmackleFunky/master  
						
						... 
						
						
						
						Allow toggling out of plover layer 
						
						
					 
					
						2016-07-28 12:26:11 -04:00 
						 
				 
			
				
					
						
							
							
								Callum Oakley 
							
						 
					 
					
						
						
						
						
							
						
						
							1eeceee355 
							
						 
					 
					
						
						
							
							Added readme.md for custom layout.  
						
						
						
						
					 
					
						2016-07-28 12:15:55 +01:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							684d869fab 
							
						 
					 
					
						
						
							
							added homerow-ish brackets  
						
						
						
						
					 
					
						2016-07-28 11:58:53 +02:00 
						 
				 
			
				
					
						
							
							
								Callum Oakley 
							
						 
					 
					
						
						
						
						
							
						
						
							9822b9f743 
							
						 
					 
					
						
						
							
							Added custom keymap.  
						
						... 
						
						
						
						Added custom keymap. 
						
						
					 
					
						2016-07-27 21:18:19 +01:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							6ff8a81520 
							
						 
					 
					
						
						
							
							first try ar adding the parenthesis mess for german iso  
						
						
						
						
					 
					
						2016-07-27 21:11:55 +02:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							9f21c0aa06 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into iso_split_rshift  
						
						... 
						
						
						
						merge with master 
						
						
					 
					
						2016-07-27 20:35:13 +02:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							180a3da44d 
							
						 
					 
					
						
						
							
							remove unnecessary includes  
						
						
						
						
					 
					
						2016-07-27 02:32:15 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							95ef3f864e 
							
						 
					 
					
						
						
							
							fix numerous errors in bone2planck keymap  
						
						
						
						
					 
					
						2016-07-27 02:30:17 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							368d0bdf68 
							
						 
					 
					
						
						
							
							kill warnings filling up travis buildlog  
						
						
						
						
					 
					
						2016-07-27 02:21:09 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							13bb3a7379 
							
						 
					 
					
						
						
							
							update NO_AMP to NO_AMPR  
						
						
						
						
					 
					
						2016-07-27 02:06:19 -04:00 
						 
				 
			
				
					
						
							
							
								SmackleFunky 
							
						 
					 
					
						
						
						
						
							
						
						
							fdd07991de 
							
						 
					 
					
						
						
							
							Allow toggling out of plover layer  
						
						
						
						
					 
					
						2016-07-27 04:44:24 +00:00 
						 
				 
			
				
					
						
							
							
								Mazin Bokhari 
							
						 
					 
					
						
						
						
						
							
						
						
							3fd1c9d72b 
							
						 
					 
					
						
						
							
							Move to keyboards  
						
						
						
						
					 
					
						2016-07-26 22:43:04 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							57952949fe 
							
						 
					 
					
						
						
							
							General table cleanup.  
						
						
						
						
					 
					
						2016-07-26 23:33:21 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ff8136b883 
							
						 
					 
					
						
						
							
							Modified Plover layer for Impossible's home position.  
						
						
						
						
					 
					
						2016-07-26 17:39:21 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							465cf08c63 
							
						 
					 
					
						
						
							
							Removed unused layers (keeping QWERTY for later/reference)  
						
						
						
						
					 
					
						2016-07-26 17:37:56 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fb2a7d787a 
							
						 
					 
					
						
						
							
							Removed unused layers (left QWERTY for later use/reference)  
						
						
						
						
					 
					
						2016-07-26 17:29:19 -04:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							2a349e96bb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-07-26 16:35:44 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							b66131eeb5 
							
						 
					 
					
						
						
							
							disable midi by default  
						
						
						
						
					 
					
						2016-07-26 15:59:26 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							a41a7a9100 
							
						 
					 
					
						
						
							
							include base config.h instead of copying it  
						
						
						
						
					 
					
						2016-07-26 16:19:34 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							8244fa40cc 
							
						 
					 
					
						
						
							
							added config.h, and missing Ins of filpped navigation layer  
						
						
						
						
					 
					
						2016-07-26 14:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							5607b716ba 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-07-26 01:49:24 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							876a6bdd4c 
							
						 
					 
					
						
						
							
							Modified Atreus extend and Ergodox.  
						
						... 
						
						
						
						Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).
Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on. 
						
						
					 
					
						2016-07-26 01:44:57 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							27d27b179b 
							
						 
					 
					
						
						
							
							Merged branch master into bone2planck  
						
						
						
						
					 
					
						2016-07-25 22:55:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							3e462fac31 
							
						 
					 
					
						
						
							
							added missing F keys in flipped layer  
						
						
						
						
					 
					
						2016-07-25 20:21:32 +02:00 
						 
				 
			
				
					
						
							
							
								Christopher Browne 
							
						 
					 
					
						
						
						
						
							
						
						
							17a7570e08 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2016-07-25 12:55:46 -04:00 
						 
				 
			
				
					
						
							
							
								Toni 
							
						 
					 
					
						
						
						
						
							
						
						
							5e2e8c89e8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into iso_split_rshift  
						
						... 
						
						
						
						whatever 
						
						
					 
					
						2016-07-25 12:49:38 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8b94e26d7c 
							
						 
					 
					
						
						
							
							Fixes midi functionality  
						
						
						
						
					 
					
						2016-07-24 22:07:43 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							670327f1d0 
							
						 
					 
					
						
						
							
							Merge pull request  #548  from CommandLineDesign/CMD-Preonic  
						
						... 
						
						
						
						CMD keymap for Preonic 
						
						
					 
					
						2016-07-24 21:56:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							384d9cd6bb 
							
						 
					 
					
						
						
							
							Merge pull request  #546  from sethbc/satan-cleanup  
						
						... 
						
						
						
						Satan cleanup 
						
						
					 
					
						2016-07-24 21:56:23 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							4885225159 
							
						 
					 
					
						
						
							
							Merge pull request  #534  from willwm/teckinesis  
						
						... 
						
						
						
						Teckinesis for ErgoDox EZ 
						
						
					 
					
						2016-07-24 18:04:59 -07:00 
						 
				 
			
				
					
						
							
							
								Will Wolff-Myren 
							
						 
					 
					
						
						
						
						
							
						
						
							f4cb84c940 
							
						 
					 
					
						
						
							
							Remove images, per @ezuk request. =)  
						
						
						
						
					 
					
						2016-07-24 14:33:17 -07:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							36f2e22283 
							
						 
					 
					
						
						
							
							Merge pull request  #535  from algernon/ergodox-ez/algernon  
						
						... 
						
						
						
						ergodox_ez: Update my keymap to v1.3 
						
						
					 
					
						2016-07-24 11:34:33 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a41e43aa 
							
						 
					 
					
						
						
							
							Updated Readme  
						
						
						
						
					 
					
						2016-07-23 21:26:01 -07:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							c826bcfc39 
							
						 
					 
					
						
						
							
							Did a derp and forgot to set Trans on Arrow layer  
						
						
						
						
					 
					
						2016-07-23 21:08:00 -07:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							4480a74a4b 
							
						 
					 
					
						
						
							
							Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position  
						
						
						
						
					 
					
						2016-07-23 21:02:23 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							4e0bf283f6 
							
						 
					 
					
						
						
							
							added readme  
						
						
						
						
					 
					
						2016-07-24 05:11:07 +02:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							c1fb82623c 
							
						 
					 
					
						
						
							
							Tested, resolved Mouse issue, resolved numpad issue  
						
						
						
						
					 
					
						2016-07-23 20:02:45 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							1bfd57e234 
							
						 
					 
					
						
						
							
							moved insert  
						
						
						
						
					 
					
						2016-07-24 05:02:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							58f092cf87 
							
						 
					 
					
						
						
							
							moved ctrl  
						
						
						
						
					 
					
						2016-07-24 04:52:35 +02:00 
						 
				 
			
				
					
						
							
							
								commandlinedesign 
							
						 
					 
					
						
						
						
						
							
						
						
							fbafb9449e 
							
						 
					 
					
						
						
							
							Resolved errors  
						
						
						
						
					 
					
						2016-07-23 19:32:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jason Janse van Rensburg 
							
						 
					 
					
						
						
						
						
							
						
						
							34bce6f206 
							
						 
					 
					
						
						
							
							fixed stupid errors  
						
						
						
						
					 
					
						2016-07-24 04:08:40 +02:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							9b3708f830 
							
						 
					 
					
						
						
							
							Init Readme  
						
						... 
						
						
						
						This needs a better description. 
						
						
					 
					
						2016-07-23 18:52:52 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							3c7075011b 
							
						 
					 
					
						
						
							
							Create Makefile  
						
						... 
						
						
						
						This is untested, use caution. 
						
						
					 
					
						2016-07-23 18:50:41 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lucas 
							
						 
					 
					
						
						
						
						
							
						
						
							b5761df57b 
							
						 
					 
					
						
						
							
							Create CMD-Preonic Keymap  
						
						... 
						
						
						
						This is very Alpha-Mode, and has not been tested or even Made yet. 
						
						
					 
					
						2016-07-23 18:47:36 -07:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							75f0922711 
							
						 
					 
					
						
						
							
							fix typo in readme and satan.h  
						
						
						
						
					 
					
						2016-07-23 20:55:20 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							ef533be2d6 
							
						 
					 
					
						
						
							
							cleanup default layout  
						
						
						
						
					 
					
						2016-07-23 20:52:27 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							81fe3d962c 
							
						 
					 
					
						
						
							
							update sethbc keymap  
						
						
						
						
					 
					
						2016-07-23 20:37:41 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							723857bf8a 
							
						 
					 
					
						
						
							
							Table for Fn  
						
						... 
						
						
						
						layer. 
						
						
					 
					
						2016-07-22 18:19:07 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a39eaa7fb5 
							
						 
					 
					
						
						
							
							Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.  
						
						
						
						
					 
					
						2016-07-22 17:46:23 -04:00