Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							79a9e04706 
							
						 
					 
					
						
						
							
							Merge pull request  #592  from sethbc/ez-sethbc  
						
						... 
						
						
						
						Ez sethbc 
						
						
					 
					
						2016-08-02 08:03:09 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							8c52327aa6 
							
						 
					 
					
						
						
							
							Merge pull request  #593  from J3RN/master  
						
						... 
						
						
						
						Updated the J3RN ErgoDox keymap 
						
						
					 
					
						2016-08-02 08:02:27 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							6eab4ecd7e 
							
						 
					 
					
						
						
							
							Merge pull request  #600  from adiabatic/master  
						
						... 
						
						
						
						zweihander-osx: add left-hand-thumb tab key 
						
						
					 
					
						2016-08-02 08:01:56 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							56aa51664e 
							
						 
					 
					
						
						
							
							Updates ErgoDox readme  
						
						
						
						
					 
					
						2016-08-01 21:15:01 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							76ef37e72d 
							
						 
					 
					
						
						
							
							Corrected Qwerty/Fn Mismatch.  
						
						
						
						
					 
					
						2016-08-01 18:54:25 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							d5baa4773d 
							
						 
					 
					
						
						
							
							Merge pull request  #596  from fredizzimo/rid_of_quick  
						
						... 
						
						
						
						Fix the makefile dependencies and remove quick targets 
						
						
					 
					
						2016-08-01 02:24:53 -04:00 
						 
				 
			
				
					
						
							
							
								Depariel 
							
						 
					 
					
						
						
						
						
							
						
						
							a675c1aee0 
							
						 
					 
					
						
						
							
							added support for Infinity 1.1a (4th drop) matrix, no LED support yet  
						
						
						
						
					 
					
						2016-07-31 23:12:16 -04:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4b74c90cdb 
							
						 
					 
					
						
						
							
							Added quote key.  
						
						
						
						
					 
					
						2016-07-31 22:39:25 -04:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							07a631bd5a 
							
						 
					 
					
						
						
							
							Thumb ⌫ into ⇥, numpad & into :, yank home/end  
						
						... 
						
						
						
						Also: add (back?) in the light-shine disabler 
						
						
					 
					
						2016-07-31 14:21:08 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Sharfi 
							
						 
					 
					
						
						
						
						
							
						
						
							d889648d53 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:jackhumbert/qmk_firmware  
						
						... 
						
						
						
						# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex 
						
						
					 
					
						2016-07-31 14:02:25 -07:00 
						 
				 
			
				
					
						
							
							
								Depariel 
							
						 
					 
					
						
						
						
						
							
						
						
							0c4177e077 
							
						 
					 
					
						
						
							
							fixed typo in hasu/keymap.c  
						
						
						
						
					 
					
						2016-07-31 15:16:55 -04:00 
						 
				 
			
				
					
						
							
							
								Depariel 
							
						 
					 
					
						
						
						
						
							
						
						
							ceecb7c819 
							
						 
					 
					
						
						
							
							fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap  
						
						
						
						
					 
					
						2016-07-31 14:25:25 -04:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							97817a773e 
							
						 
					 
					
						
						
							
							Generate version information to version.h  
						
						... 
						
						
						
						So that only the files that really needs a version are recompiled. 
						
						
					 
					
						2016-07-31 13:42:05 +03:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							230d313dbd 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						
						
						
					 
					
						2016-07-30 17:30:10 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							a2ed7ce795 
							
						 
					 
					
						
						
							
							Add additional shortcut keymaps to TOUCHCURSOR layer  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							db8ad8204e 
							
						 
					 
					
						
						
							
							Add additional maps for [, and ], to LOWER  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							b54a58859f 
							
						 
					 
					
						
						
							
							Make RAISE layer an all numbers/arithmatic layer  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							216efe6c99 
							
						 
					 
					
						
						
							
							Move reset to a less accessible location  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							e0dd9d6af0 
							
						 
					 
					
						
						
							
							Add -, +, and . to RAISE  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							6a2c681ae9 
							
						 
					 
					
						
						
							
							Change calls from persistant_default_layer_set() to default_layer_set()  
						
						
						
						
					 
					
						2016-07-30 12:52:51 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							eb9416a67d 
							
						 
					 
					
						
						
							
							PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers  
						
						
						
						
					 
					
						2016-07-30 12:52:46 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Arnett 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1876e100be 
							
						 
					 
					
						
						
							
							Updated readme with recent changes  
						
						
						
						
					 
					
						2016-07-30 14:37:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17bd4ac062 
							
						 
					 
					
						
						
							
							Updated my keymap  
						
						
						
						
					 
					
						2016-07-30 14:07:27 -04:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							984fc2b630 
							
						 
					 
					
						
						
							
							Media keys for all the "regular" layers  
						
						
						
						
					 
					
						2016-07-30 10:13:50 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							7209310d1b 
							
						 
					 
					
						
						
							
							Add mouse layer, and remove default arrow keys (touchcursor only, now)  
						
						
						
						
					 
					
						2016-07-30 10:13:50 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							a6bae9fb07 
							
						 
					 
					
						
						
							
							Add numbers to _RAISE  
						
						
						
						
					 
					
						2016-07-30 10:13:49 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							6baf77d8fb 
							
						 
					 
					
						
						
							
							Move _RAISE symbols to _LOWER  
						
						
						
						
					 
					
						2016-07-30 10:13:49 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							ad7e4af45c 
							
						 
					 
					
						
						
							
							Tap for Enter, hold for Shift  
						
						
						
						
					 
					
						2016-07-30 10:13:49 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d77440b6 
							
						 
					 
					
						
						
							
							Add personalized TouchCursor layer  
						
						
						
						
					 
					
						2016-07-30 10:13:49 -07:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							eb1a06d3ae 
							
						 
					 
					
						
						
							
							Tap for Esc, hold for Control  
						
						
						
						
					 
					
						2016-07-30 10:13:44 -07:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							a6ec5fa74a 
							
						 
					 
					
						
						
							
							rebase  
						
						
						
						
					 
					
						2016-07-30 10:46:13 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							694567f799 
							
						 
					 
					
						
						
							
							update makefile  
						
						
						
						
					 
					
						2016-07-30 10:42:57 -04:00 
						 
				 
			
				
					
						
							
							
								Seth Chandler 
							
						 
					 
					
						
						
						
						
							
						
						
							a01d703a58 
							
						 
					 
					
						
						
							
							initial commit of sethbc keymap  
						
						
						
						
					 
					
						2016-07-30 10:42:57 -04:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							cf795a6f93 
							
						 
					 
					
						
						
							
							Moved PREVENT_STUCK_MODIFIERS to config.h  
						
						
						
						
					 
					
						2016-07-30 09:19:17 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							0064f1f84c 
							
						 
					 
					
						
						
							
							Moved my Ergodox keymap to match upstream changes  
						
						
						
						
					 
					
						2016-07-30 08:46:01 -05:00 
						 
				 
			
				
					
						
							
							
								Joshua T 
							
						 
					 
					
						
						
						
						
							
						
						
							e9a501d447 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2016-07-30 08:41:22 -05:00 
						 
				 
			
				
					
						
							
							
								JeeBak Kim 
							
						 
					 
					
						
						
						
						
							
						
						
							f78a994355 
							
						 
					 
					
						
						
							
							Add "jeebak" keymap folder as a copy of the "default" folder  
						
						
						
						
					 
					
						2016-07-30 00:16:04 -07:00 
						 
				 
			
				
					
						
							
							
								Gergely Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9bf1f165 
							
						 
					 
					
						
						
							
							Update some obsolete references  
						
						... 
						
						
						
						Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.
Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> 
						
						
					 
					
						2016-07-30 08:37:30 +02:00 
						 
				 
			
				
					
						
							
							
								Stephen Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5f2d3f27de 
							
						 
					 
					
						
						
							
							Moved CapsLk, ScrollLk, and NumLk to Adjust layer  
						
						
						
						
					 
					
						2016-07-30 00:56:43 -04:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							566c79554e 
							
						 
					 
					
						
						
							
							Small fix for infinity include guard  
						
						
						
						
					 
					
						2016-07-29 21:09:42 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8a5aca9d 
							
						 
					 
					
						
						
							
							Fix typo in the readme.  
						
						
						
						
					 
					
						2016-07-29 21:09:41 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							401dd09077 
							
						 
					 
					
						
						
							
							A couple of more Ergodox readme fixes  
						
						
						
						
					 
					
						2016-07-29 21:09:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							c65da1f208 
							
						 
					 
					
						
						
							
							Unify the ErgoDox EZ and Infinity documentation  
						
						
						
						
					 
					
						2016-07-29 21:09:39 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							44cefcb40a 
							
						 
					 
					
						
						
							
							Refer to the right path in the readme  
						
						
						
						
					 
					
						2016-07-29 21:09:38 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							349f189e83 
							
						 
					 
					
						
						
							
							Move Ergodox readme from ez subfolder to parent  
						
						
						
						
					 
					
						2016-07-29 21:09:37 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							ad416fb1a3 
							
						 
					 
					
						
						
							
							Include the main Makefile before including Ergodox infinity drivers  
						
						
						
						
					 
					
						2016-07-29 21:09:37 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							592ef7c6f0 
							
						 
					 
					
						
						
							
							Move Infinity Ergodox drivers to subproject, and fix makefile  
						
						
						
						
					 
					
						2016-07-29 21:09:36 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							37052a53f1 
							
						 
					 
					
						
						
							
							Remove the Infinity Ergodox default keymap  
						
						
						
						
					 
					
						2016-07-29 21:09:35 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							650298cec3 
							
						 
					 
					
						
						
							
							Cleanup the townk_osx config.h and make files  
						
						
						
						
					 
					
						2016-07-29 21:09:34 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							fd7f20b029 
							
						 
					 
					
						
						
							
							Rename supercoder config_user to config.h  
						
						... 
						
						
						
						Also fixup the include path of parent config 
						
						
					 
					
						2016-07-29 21:09:33 +03:00