Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								670256c943 
								
							 
						 
						
							
							
								
								Merge pull request  #71  from andruby/andrew_osx  
							
							... 
							
							
							
							Andrew's OSX ergodox ez keymap 
							
						 
						
							2016-01-06 00:01:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								ee424f8608 
								
							 
						 
						
							
							
								
								Adding update of vagrant VM every time it is booted  
							
							
							
						 
						
							2016-01-05 22:39:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Fecheyr 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a4952f4b 
								
							 
						 
						
							
							
								
								Andrew's OSX ergodox ez keymap  
							
							
							
						 
						
							2016-01-05 11:44:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Pérochon 
								
							 
						 
						
							
							
							
							
								
							
							
								bee19e5261 
								
							 
						 
						
							
							
								
								ergodox_ez: Add keymap_osx_fr hex file  
							
							
							
						 
						
							2016-01-05 10:56:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Pérochon 
								
							 
						 
						
							
							
							
							
								
							
							
								14b4a01e7e 
								
							 
						 
						
							
							
								
								ergodox_ez: Add French keymap for OSX (keymap_osx_fr) based on keymap_default_osx  
							
							
							
						 
						
							2016-01-05 10:49:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Pérochon 
								
							 
						 
						
							
							
							
							
								
							
							
								48eff6dd89 
								
							 
						 
						
							
							
								
								quantum: Add French keymap for OSX (keymap_french_osx)  
							
							
							
						 
						
							2016-01-05 10:49:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Justin Garrison 
								
							 
						 
						
							
							
							
							
								
							
							
								6da712ce5e 
								
							 
						 
						
							
							
								
								added jgarr keymap for custom dvorak layout :yay:  
							
							
							
						 
						
							2016-01-04 09:18:06 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								ab7d6dca41 
								
							 
						 
						
							
							
								
								Adding Vagrantfile for easier compile environment setup  
							
							
							
						 
						
							2016-01-03 22:21:30 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								3bb3e7a72c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							
							
						 
						
							2016-01-04 00:02:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								a07d2df99c 
								
							 
						 
						
							
							
								
								Added calculator shortcut button to numpad/symbol layer  
							
							
							
						 
						
							2016-01-02 21:16:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								ae842a5a0f 
								
							 
						 
						
							
							
								
								Fixed Plover layer label and updated keymap  
							
							
							
						 
						
							2016-01-02 18:46:31 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								45fec698d8 
								
							 
						 
						
							
							
								
								Added proper link back to Plover layout source  
							
							
							
						 
						
							2016-01-02 15:12:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								4c3ecbc0b7 
								
							 
						 
						
							
							
								
								Added plover layer  
							
							
							
						 
						
							2016-01-02 15:05:33 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								0f2c7730d4 
								
							 
						 
						
							
							
								
								Merge pull request  #68  from waveform80/daves-comments  
							
							... 
							
							
							
							Added comments to LED stuff and included .hex file 
							
						 
						
							2016-01-02 14:22:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dave Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								dcc9948fae 
								
							 
						 
						
							
							
								
								Added comments to LED stuff and included .hex file  
							
							
							
						 
						
							2016-01-02 18:23:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								5259f36d03 
								
							 
						 
						
							
							
								
								Merge pull request  #66  from gdiegel/master  
							
							... 
							
							
							
							Fix for faulty fn layer 
							
						 
						
							2016-01-02 11:58:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								41d4cf05ef 
								
							 
						 
						
							
							
								
								Merge pull request  #67  from waveform80/daves-keymap  
							
							... 
							
							
							
							Dave's custom keymap 
							
						 
						
							2016-01-02 11:58:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dave Jones 
								
							 
						 
						
							
							
							
							
								
							
							
								7ba06c9e0d 
								
							 
						 
						
							
							
								
								Dave's custom keymap  
							
							... 
							
							
							
							This moves the keys closer to a traditional layout with some redundancy
around the middle to compensate for fast non-traditional typists like
myself who tend to wander from the home row a fair bit. Navigation keys
are provided in layer 2 (accessed by left thumb button), programming
symbols and classic numeric keypad in layer 1 (accessed by right thumb
button). Permanent layer switching is provided with a smaller thumb
button. Ctrl provided in place of caps lock (because no-one needs
caps/num lock), space, backspace, enter, shift all in traditional
positions with layer 1 providing things like equals, tilde and
apostrophe (an attempt to re-use existing muscle memory).
LEDs are pimped to the point of being silly (fading in/out on layer
switch, rolling on reboot ... because I can). Power and reset keys
provided on left thumb pad in layer 2.
No meh or hyper as I haven't found a burning need for them yet. 
							
						 
						
							2016-01-02 11:19:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Diegel 
								
							 
						 
						
							
							
							
							
								
							
							
								1cdcbc9865 
								
							 
						 
						
							
							
								
								Fix incorrect number of rows on fn layer. Add additional navigation keys  
							
							... 
							
							
							
							to fn layer 
							
						 
						
							2016-01-02 10:31:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								9c5f30ed83 
								
							 
						 
						
							
							
								
								Merge pull request  #63  from MattLeBeauViewpoint/master  
							
							... 
							
							
							
							Small change to filename spelling in README 
							
						 
						
							2015-12-31 20:07:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MattLeBeauViewpoint 
								
							 
						 
						
							
							
							
							
								
							
							
								f1dea975d2 
								
							 
						 
						
							
							
								
								Small change to filename spelling in README  
							
							... 
							
							
							
							Edited filename to remove plural case in example so that prefix is
correctly parsed in step 6. 
							
						 
						
							2015-12-31 10:16:51 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								d901511f76 
								
							 
						 
						
							
							
								
								Fixed button conflicts on mouse/media layer  
							
							
							
						 
						
							2015-12-30 23:53:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								c760a273fb 
								
							 
						 
						
							
							
								
								Added note about avr-libc also being required at least for arch  
							
							
							
						 
						
							2015-12-30 23:22:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								24e30249a4 
								
							 
						 
						
							
							
								
								Moving everything around, tap delays driving me nuts  
							
							
							
						 
						
							2015-12-30 23:03:33 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Justin Garrison 
								
							 
						 
						
							
							
							
							
								
							
							
								14a5b4b5c8 
								
							 
						 
						
							
							
								
								added dvorak keymap and layout picture  
							
							
							
						 
						
							2015-12-30 00:19:55 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								f68f1c7432 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:dragon788/qmk_firmware_ez  
							
							
							
						 
						
							2015-12-28 14:45:13 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								d1f8d0104b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:jackhumbert/qmk_firmware  
							
							... 
							
							
							
							Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c 
							
						 
						
							2015-12-28 14:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								01dc8b3244 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:dragon788/qmk_firmware_ez  
							
							... 
							
							
							
							Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c 
							
						 
						
							2015-12-27 13:15:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								381ca294fe 
								
							 
						 
						
							
							
								
								minor fixes, added backtick to left thumbblock  
							
							
							
						 
						
							2015-12-25 00:00:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dragon788 
								
							 
						 
						
							
							
							
							
								
							
							
								b61ea5dfaf 
								
							 
						 
						
							
							
								
								Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis-like  
							
							
							
						 
						
							2015-12-23 22:05:59 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								9814343336 
								
							 
						 
						
							
							
								
								Merge pull request  #56  from sboesebeck/master  
							
							... 
							
							
							
							fix number pad for german keys 
							
						 
						
							2015-12-23 12:01:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Erez Zukerman 
								
							 
						 
						
							
							
							
							
								
							
							
								58e237d2dc 
								
							 
						 
						
							
							
								
								Updates readme  
							
							
							
						 
						
							2015-12-23 15:28:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								7115196ddf 
								
							 
						 
						
							
							
								
								fix number pad for german keys  
							
							
							
						 
						
							2015-12-23 13:32:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								694fe4e1e2 
								
							 
						 
						
							
							
								
								Merge pull request  #55  from sboesebeck/master  
							
							... 
							
							
							
							fixed some typos, learned, DE_-keycodes are for Win, not OSX 
							
						 
						
							2015-12-22 17:51:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								d3e54552fb 
								
							 
						 
						
							
							
								
								fixed some typos, learned, DE_-keycodes are for Win, not OSX  
							
							
							
						 
						
							2015-12-22 23:49:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								b1fbd4c9ca 
								
							 
						 
						
							
							
								
								Merge pull request  #53  from sboesebeck/master  
							
							... 
							
							
							
							minor updates 
							
						 
						
							2015-12-21 19:31:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								370e9028ac 
								
							 
						 
						
							
							
								
								new firmware file containing current changes  
							
							
							
						 
						
							2015-12-22 01:25:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								5f0965ce39 
								
							 
						 
						
							
							
								
								added png file for layout documentation  
							
							
							
						 
						
							2015-12-22 01:23:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b563816 
								
							 
						 
						
							
							
								
								minor changes, fixes  
							
							
							
						 
						
							2015-12-22 01:18:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								40119017f2 
								
							 
						 
						
							
							
								
								Merge pull request  #52  from technovangelist/master  
							
							... 
							
							
							
							first attempt at a working workman layout for the ergodoxez 
							
						 
						
							2015-12-21 11:52:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Technovangelist 
								
							 
						 
						
							
							
							
							
								
							
							
								42ca2e6684 
								
							 
						 
						
							
							
								
								swapped the space and enter to get the space under where the thumb is.  
							
							
							
						 
						
							2015-12-21 10:20:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Technovangelist 
								
							 
						 
						
							
							
							
							
								
							
							
								a67ef035b8 
								
							 
						 
						
							
							
								
								first attempt at a working workman layout for the ergodoxez  
							
							
							
						 
						
							2015-12-21 09:52:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									chwilk 
								
							 
						 
						
							
							
							
							
								
							
							
								2b1a256825 
								
							 
						 
						
							
							
								
								Added keymap variant to approximate Kin Adv  
							
							
							
						 
						
							2015-12-20 22:09:26 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Diegel 
								
							 
						 
						
							
							
							
							
								
							
							
								d7d092de5f 
								
							 
						 
						
							
							
								
								Use planck-style arrow keys  
							
							
							
						 
						
							2015-12-20 23:05:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								e70cdb0693 
								
							 
						 
						
							
							
								
								Merge pull request  #47  from pnutster/master  
							
							... 
							
							
							
							OSX Kinesis-like Mapping 
							
						 
						
							2015-12-19 23:50:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								765c1b9f4d 
								
							 
						 
						
							
							
								
								Merge pull request  #46  from sboesebeck/master  
							
							... 
							
							
							
							German layout for osx 
							
						 
						
							2015-12-19 23:49:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Piet Nutbey 
								
							 
						 
						
							
							
							
							
								
							
							
								cc79f17424 
								
							 
						 
						
							
							
								
								Fixed keymap "graphic"  
							
							
							
						 
						
							2015-12-19 23:24:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Piet Nutbey 
								
							 
						 
						
							
							
							
							
								
							
							
								ac3513b79f 
								
							 
						 
						
							
							
								
								corrected folder  
							
							
							
						 
						
							2015-12-19 22:50:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Piet Nutbey 
								
							 
						 
						
							
							
							
							
								
							
							
								190562288c 
								
							 
						 
						
							
							
								
								OSX Kinesis-like Mapping  
							
							... 
							
							
							
							OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point. 
							
						 
						
							2015-12-19 21:38:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephan Bösebeck 
								
							 
						 
						
							
							
							
							
								
							
							
								737afc9dc7 
								
							 
						 
						
							
							
								
								added hex file  
							
							
							
						 
						
							2015-12-20 01:00:23 +01:00