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 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephan Bösebeck
								
							 
						 | 
						
							
							
							
							
								
							
							
								203528869d
								
							
						 | 
						
							
							
								
								typo fix
							
							
							
							
							
						 | 
						
							2015-12-20 00:59:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephan Bösebeck
								
							 
						 | 
						
							
							
							
							
								
							
							
								f35609bd89
								
							
						 | 
						
							
							
								
								minor change
							
							
							
							
							
						 | 
						
							2015-12-20 00:57:35 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephan Bösebeck
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b579212d4
								
							
						 | 
						
							
							
								
								added hex file and readme
							
							
							
							
							
						 | 
						
							2015-12-20 00:54:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephan Bösebeck
								
							 
						 | 
						
							
							
							
							
								
							
							
								56104858fc
								
							
						 | 
						
							
							
								
								first version for german osx layout
							
							
							
							
							
						 | 
						
							2015-12-20 00:49:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0acb8a0ee
								
							
						 | 
						
							
							
								
								Merge pull request #45 from matzebond/master
							
							
							
							
							
							
							
							German keymap + ErgoDox keymaps 
							
						 | 
						
							2015-12-19 14:26:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								11f0724951
								
							
						 | 
						
							
							
								
								Further clarifies README
							
							
							
							
							
						 | 
						
							2015-12-19 19:00:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthias Schmitt
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b7870bae1
								
							
						 | 
						
							
							
								
								Add neo2 keymap and neo2 ergodox layout
							
							
							
							
							
						 | 
						
							2015-12-19 01:41:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthias Schmitt
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c15dac7db
								
							
						 | 
						
							
							
								
								Add Ctrl-Shift tap modifier
							
							
							
							
							
						 | 
						
							2015-12-19 01:39:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthias Schmitt
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dbcad51d1
								
							
						 | 
						
							
							
								
								Add german keymap and german ergodox layout
							
							
							
							
							
						 | 
						
							2015-12-19 01:22:12 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f22b67f8a
								
							
						 | 
						
							
							
								
								Updates readme
							
							
							
							
							
						 | 
						
							2015-12-18 16:03:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a58ce3881
								
							
						 | 
						
							
							
								
								jack's ergodox layout
							
							
							
							
							
						 | 
						
							2015-12-17 22:44:09 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								f4efa110f8
								
							
						 | 
						
							
							
								
								Fixes media keys on OSX layout
							
							
							
							
							
						 | 
						
							2015-12-18 04:08:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7c414b2fb
								
							
						 | 
						
							
							
								
								Adds a new default keymap for OSX with working prev/next keys
							
							
							
							
							
						 | 
						
							2015-12-18 03:48:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								7923f212e1
								
							
						 | 
						
							
							
								
								Moves compiled default keymap + legends to keymaps directory
							
							
							
							
							
						 | 
						
							2015-12-18 03:42:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f4553cb90
								
							
						 | 
						
							
							
								
								A compiled version which sends left click in mouse mode
							
							
							
							
							
						 | 
						
							2015-12-16 19:03:30 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erez Zukerman
								
							 
						 | 
						
							
							
							
							
								
							
							
								85b7c339dd
								
							
						 | 
						
							
							
								
								Merge pull request #41 from joshmccall221/right_click_fix
							
							
							
							
							
							
							
							Left click was mapped to scroll wheel. This fixes that. :) 
							
						 | 
						
							2015-12-16 12:01:45 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Josh McCall
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e290a7d59
								
							
						 | 
						
							
							
								
								Left click was mapped to scroll wheel. This fixes that. :)
							
							
							
							
							
						 | 
						
							2015-12-16 10:21:42 -06:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Josh McCall
								
							 
						 | 
						
							
							
							
							
								
							
							
								c63c615ff8
								
							
						 | 
						
							
							
								
								add left click and vim keys
							
							
							
							
							
						 | 
						
							2015-12-16 04:12:57 -06:00 | 
						
						
							
							
							
							
								
							
							
						 |