Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	3a9d1c4279  
						 
						
							
							
								
								
								[Jack & Erez] Enables config_user.h per keymap  
							
							 
							
							
							
							
						 
						
							2016-05-05 22:23:32 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	8ffc73fcbd  
						 
						
							
							
								
								
								[Jack & Erez] Adds an option for user-specific config.h files  
							
							 
							
							
							
							
						 
						
							2016-05-05 22:21:39 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	f293bf2340  
						 
						
							
							
								
								
								[Jack & Erez] Removes duplicate reference, sorts whitespace  
							
							 
							
							
							
							
						 
						
							2016-05-05 22:19:29 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	41b3e399b1  
						 
						
							
							
								
								
								adds keycode shortcuts for OSL and OSM  
							
							 
							
							
							
							
						 
						
							2016-05-05 21:50:51 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thiago Alves 
								
							 
						 
						
							
							
								
							
							
	74e97eefd7  
						 
						
							
							
								
								
								Adds oneshot layer and oneshot tap toggling ( #308 )  
							
							 
							
							... 
							
							
							
							
							This commit is mostly a cherry-pick from `ahtn` at
https://github.com/tmk/tmk_keyboard/pull/255 .
These are the changes:
* Adds ACTION_LAYER_ONESHOT
* Adds ONESHOT_TAP_TOGGLE
* Mentions sticky keys in the docs on oneshot. 
							
						 
						
							2016-05-05 21:41:37 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tom Duckering 
								
							 
						 
						
							
							
								
							
							
	d4520cd3ac  
						 
						
							
							
								
								
								Referencing the hex file ( #309 )  
							
							 
							
							... 
							
							
							
							
							Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;) 
							
						 
						
							2016-05-05 18:27:28 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	356dba7e61  
						 
						
							
							
								
								
								updates atreus's column mapping  
							
							 
							
							
							
							
						 
						
							2016-05-05 12:05:09 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	2e02886a1e  
						 
						
							
							
								
								
								remove typo  
							
							 
							
							
							
							
						 
						
							2016-05-05 16:52:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	a096d205aa  
						 
						
							
							
								
								
								making default osx more ELG conform  
							
							 
							
							
							
							
						 
						
							2016-05-05 16:48:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	7060e10669  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-05-05 16:28:47 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	5daf24b1a5  
						 
						
							
							
								
								
								The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out.  
							
							 
							
							
							
							
						 
						
							2016-05-04 22:17:47 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	dbb1c2f281  
						 
						
							
							
								
								
								Merge pull request  #305  from nrrkeene/master  
							
							 
							
							... 
							
							
							
							
							Custom handling for shift keys, improved media layer 
							
						 
						
							2016-05-04 22:31:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	660511f050  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-05-04 08:03:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	31a697bc05  
						 
						
							
							
								
								
								Merge pull request  #304  from adiabatic/ergodox-zweihander-osx  
							
							 
							
							... 
							
							
							
							
							zweihander: comment out action_get_macro() 
							
						 
						
							2016-05-03 22:27:39 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan Sharfi 
								
							 
						 
						
							
							
								
							
							
	6bafe44486  
						 
						
							
							
								
								
								zweihander: comment out action_get_macro()  
							
							 
							
							
							
							
						 
						
							2016-05-03 19:19:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	4b74eca2a5  
						 
						
							
							
								
								
								The Ordinary Layout is arranged as close as possible to a traditional keyboard, but with extra special features  
							
							 
							
							
							
							
						 
						
							2016-05-03 20:58:27 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	575ca2b96d  
						 
						
							
							
								
								
								The Ordinary Layout works the way you expect it to, with extra powerful features  
							
							 
							
							
							
							
						 
						
							2016-05-03 20:40:15 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	83e1cc241e  
						 
						
							
							
								
								
								Clarified audio.c ( #302 )  
							
							 
							
							... 
							
							
							
							
							* Updated personal layouts
* tweaked personal
* Nightly - Audio Cleanup
Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP
* nightly - collapsed code
* Added check for note playing to LEDs 
							
						 
						
							2016-05-03 13:56:40 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	507db3ab13  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-05-03 08:29:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	35d7081899  
						 
						
							
							
								
								
								Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
							
							 
							
							
							
							
						 
						
							2016-05-02 23:15:56 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	8b0274f60a  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-05-02 21:35:58 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	2c070163ff  
						 
						
							
							
								
								
								Merge pull request  #300  from Twey/tweymap-momentary  
							
							 
							
							... 
							
							
							
							
							Swap steno/media layers to allow using media keys in the Plover layer… 
							
						 
						
							2016-05-02 21:04:13 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James ‘Twey’ Kay 
								
							 
						 
						
							
							
								
							
							
	1173dbd02f  
						 
						
							
							
								
								
								Swap steno/media layers to allow using media keys in the Plover layer; display all active layers, not just the top; use only momentary modifiers  
							
							 
							
							
							
							
						 
						
							2016-05-02 19:22:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	61b2b58bee  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-05-02 14:38:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	1ce6da2605  
						 
						
							
							
								
								
								Merge pull request  #298  from adiabatic/ergodox-zweihander-osx  
							
							 
							
							... 
							
							
							
							
							ergodox-zweihander-osx: initial commit 
							
						 
						
							2016-05-02 08:30:34 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	98ed12843e  
						 
						
							
							
								
								
								Merge pull request  #294  from sneako/master  
							
							 
							
							... 
							
							
							
							
							Add my Ergodox EZ config 
							
						 
						
							2016-05-02 08:24:26 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	84b736dc7f  
						 
						
							
							
								
								
								Merge pull request  #258  from romanzolotarev/master  
							
							 
							
							... 
							
							
							
							
							Add Roman's single layer layout based on Norman 
							
						 
						
							2016-05-02 08:24:11 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	0e7a3a25bb  
						 
						
							
							
								
								
								new version of the experimental layout. changed media keys in MDIA layer  
							
							 
							
							
							
							
						 
						
							2016-05-02 13:46:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	1076c2b122  
						 
						
							
							
								
								
								The Ordinary Layout is the layout you are looking for. Come and see v3.14.  
							
							 
							
							
							
							
						 
						
							2016-05-01 23:16:41 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan Sharfi 
								
							 
						 
						
							
							
								
							
							
	fe022a508f  
						 
						
							
							
								
								
								zweihander: move dim/brighten to 1/2, add ⌘Q  
							
							 
							
							
							
							
						 
						
							2016-05-01 15:12:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan Sharfi 
								
							 
						 
						
							
							
								
							
							
	9b163d2feb  
						 
						
							
							
								
								
								zweihander: Add ⌘, ⌘⇧, ⌥⇥, ⌥⇧⇥  
							
							 
							
							
							
							
						 
						
							2016-05-01 13:55:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan Sharfi 
								
							 
						 
						
							
							
								
							
							
	8ec1d41a28  
						 
						
							
							
								
								
								Ergodox EZ:  add zweihander-osx.hex  
							
							 
							
							
							
							
						 
						
							2016-04-30 22:36:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nathan Sharfi 
								
							 
						 
						
							
							
								
							
							
	262930c8d5  
						 
						
							
							
								
								
								ergodox-zweihander: initial commit  
							
							 
							
							
							
							
						 
						
							2016-04-30 22:12:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	f0c8e7c495  
						 
						
							
							
								
								
								Fix a few led test animation issues  
							
							 
							
							
							
							
						 
						
							2016-04-30 22:45:41 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	c3aa0a23ed  
						 
						
							
							
								
								
								Merge pull request  #292  from abperiasamy/ergo-ab  
							
							 
							
							... 
							
							
							
							
							Beginner's keymap for Ergodox-EZ 
							
						 
						
							2016-04-30 14:56:58 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Anand Babu (AB) Periasamy 
								
							 
						 
						
							
							
								
							
							
	ed0798de24  
						 
						
							
							
								
								
								Beginner's keymap for Ergodox-EZ  
							
							 
							
							
							
							
						 
						
							2016-04-30 11:28:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivier 
								
							 
						 
						
							
							
								
							
							
	dc7b606ff1  
						 
						
							
							
								
								
								Update firmware with latest QMK code.  
							
							 
							
							
							
							
						 
						
							2016-04-30 16:06:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivier 
								
							 
						 
						
							
							
								
							
							
	09ea12f9ca  
						 
						
							
							
								
								
								Merge  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-04-30 16:03:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olivier 
								
							 
						 
						
							
							
								
							
							
	9d48ba9713  
						 
						
							
							
								
								
								Add a macro for Ctrl+Alt+Fx.  
							
							 
							
							
							
							
						 
						
							2016-04-30 16:01:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	e7d56215de  
						 
						
							
							
								
								
								Merge pull request  #295  from techtomas/techtomas  
							
							 
							
							... 
							
							
							
							
							Add my layout to the list 
							
						 
						
							2016-04-30 07:42:20 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	0656f2fa10  
						 
						
							
							
								
								
								moves backlight functionality to keyboard files and updates template makefile  
							
							 
							
							... 
							
							
							
							
							previously there were two backlight.c files (bad) 
							
						 
						
							2016-04-29 22:19:40 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9ab7098c83  
						 
						
							
							
								
								
								fixes plover start sound  
							
							 
							
							
							
							
						 
						
							2016-04-29 21:21:08 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Anderson 
								
							 
						 
						
							
							
								
							
							
	fb57b2e55d  
						 
						
							
							
								
								
								Added readme  
							
							 
							
							
							
							
						 
						
							2016-04-29 17:25:14 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Anderson 
								
							 
						 
						
							
							
								
							
							
	711809fdac  
						 
						
							
							
								
								
								Finalized my personal layout  
							
							 
							
							
							
							
						 
						
							2016-04-29 14:42:31 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	9edcfcdf6f  
						 
						
							
							
								
								
								Adds brackets to inner vertical keys in experimental layout  
							
							 
							
							
							
							
						 
						
							2016-04-29 22:39:05 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	66e0323881  
						 
						
							
							
								
								
								removes extra voices, updates .hex files  
							
							 
							
							
							
							
						 
						
							2016-04-29 12:42:55 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	2bbf3d5820  
						 
						
							
							
								
								
								stops forcing debug_action  
							
							 
							
							
							
							
						 
						
							2016-04-28 23:23:33 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	27d24faf39  
						 
						
							
							
								
								
								adds condition to one last audio ref in planck default  
							
							 
							
							
							
							
						 
						
							2016-04-28 23:11:09 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									skullY 
								
							 
						 
						
							
							
								
							
							
	ca9b85f702  
						 
						
							
							
								
								
								Bring the clueboard firmware size down  
							
							 
							
							
							
							
						 
						
							2016-04-28 20:07:07 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sneako 
								
							 
						 
						
							
							
								
							
							
	b79124ac14  
						 
						
							
							
								
								
								Adding .hex file  
							
							 
							
							
							
							
						 
						
							2016-04-28 22:20:25 -04:00