Brendan Johan Lee 
								
							 
						 
						
							
							
							
							
								
							
							
								1121753746 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2017-01-10 19:21:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Johan Lee 
								
							 
						 
						
							
							
							
							
								
							
							
								db1aec159d 
								
							 
						 
						
							
							
								
								Added layer images to deadcyclo layout readme  
							
							
							
						 
						
							2017-01-10 19:20:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								a55c5e3ea3 
								
							 
						 
						
							
							
								
								Wait for two ticks rather than 1  
							
							
							
						 
						
							2017-01-10 03:00:36 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								0b38204e62 
								
							 
						 
						
							
							
								
								Fix mismatched indentation  
							
							
							
						 
						
							2017-01-09 11:57:44 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								49a00a535f 
								
							 
						 
						
							
							
								
								Update clock frequencies to match the infinity ergodox  
							
							
							
						 
						
							2017-01-09 11:15:10 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								a702f4631e 
								
							 
						 
						
							
							
								
								Increase tick frequency for responsiveness  
							
							... 
							
							
							
							Based off of PR #866  which did the same thing for the infinity60 
							
						 
						
							2017-01-09 10:54:36 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								ef2ebeb3ca 
								
							 
						 
						
							
							
								
								Remove KC_ prefix from KEYMAP macro to match other keyboards  
							
							
							
						 
						
							2017-01-09 10:45:34 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									milestogo 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4cc2f3f1 
								
							 
						 
						
							
							
								
								removing old programmer layout, in favor of milestogo  
							
							
							
						 
						
							2017-01-08 22:25:41 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									milestogo 
								
							 
						 
						
							
							
							
							
								
							
							
								62f1c13c3a 
								
							 
						 
						
							
							
								
								trying to clean up duplicate docs  
							
							
							
						 
						
							2017-01-08 22:17:47 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									milestogo 
								
							 
						 
						
							
							
							
							
								
							
							
								f74ff86f9c 
								
							 
						 
						
							
							
								
								kinesis remap  
							
							
							
						 
						
							2017-01-08 22:02:01 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								176b93d08e 
								
							 
						 
						
							
							
								
								Merge pull request  #994  from priyadi/unicode_mods_fix  
							
							... 
							
							
							
							Unregister all mods before inputting Unicode, and reregister afterwards 
							
						 
						
							2017-01-08 21:12:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								18d013b25b 
								
							 
						 
						
							
							
								
								Merge pull request  #993  from priyadi/greek_layer  
							
							... 
							
							
							
							Greek alphabet layer 
							
						 
						
							2017-01-08 21:11:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b445b03b 
								
							 
						 
						
							
							
								
								Merge pull request  #990  from replicaJunction/master  
							
							... 
							
							
							
							Update replicaJunction keymap 
							
						 
						
							2017-01-08 21:10:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Priyadi Iman Nurcahyo 
								
							 
						 
						
							
							
							
							
								
							
							
								30b80a23f3 
								
							 
						 
						
							
							
								
								Unregister all mods before inputting Unicode, and reregister afterwards  
							
							
							
						 
						
							2017-01-09 02:59:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Priyadi Iman Nurcahyo 
								
							 
						 
						
							
							
							
							
								
							
							
								02055406e8 
								
							 
						 
						
							
							
								
								Greek alphabet layer  
							
							
							
						 
						
							2017-01-09 02:50:13 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Priyadi Iman Nurcahyo 
								
							 
						 
						
							
							
							
							
								
							
							
								3a71f3534a 
								
							 
						 
						
							
							
								
								Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium  
							
							
							
						 
						
							2017-01-09 02:48:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Priyadi Iman Nurcahyo 
								
							 
						 
						
							
							
							
							
								
							
							
								58b2536bf1 
								
							 
						 
						
							
							
								
								om telolet om  
							
							
							
						 
						
							2017-01-08 23:45:16 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Priyadi Iman Nurcahyo 
								
							 
						 
						
							
							
							
							
								
							
							
								b0a9bd319b 
								
							 
						 
						
							
							
								
								om telolet om  
							
							
							
						 
						
							2017-01-08 22:45:16 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								cfb45027bb 
								
							 
						 
						
							
							
								
								Removed build.bat  
							
							... 
							
							
							
							Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it. 
							
						 
						
							2017-01-07 14:05:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								8f8d104759 
								
							 
						 
						
							
							
								
								Merged from upstream  
							
							
							
						 
						
							2017-01-07 14:01:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								b7b44dc481 
								
							 
						 
						
							
							
								
								Updated README and images to reflect latest keymap  
							
							
							
						 
						
							2017-01-07 13:57:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								677ae86bde 
								
							 
						 
						
							
							
								
								Added another Shift on Extend layer.  
							
							... 
							
							
							
							This moves the GUI key to the pinkie, but honestly, I never use that function anyway. 
							
						 
						
							2017-01-07 13:07:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								fe51724544 
								
							 
						 
						
							
							
								
								Updated Atreus layout to 0.4  
							
							... 
							
							
							
							Removed Alt on base layer, replaced with Function layer.
Moved function keys to left hand.  Added mouse keys to right hand on the function layer.
Moved middle click on gaming layer to be consistent with mouse layer.
Added macro _USER. Macro contents are not implemented yet. 
							
						 
						
							2017-01-06 19:56:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								5ce7ec9ea5 
								
							 
						 
						
							
							
								
								Increased TAPPING_TERM to 200  
							
							
							
						 
						
							2017-01-06 17:08:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua T 
								
							 
						 
						
							
							
							
							
								
							
							
								6fba925f41 
								
							 
						 
						
							
							
								
								Fixed key not matching its diagram  
							
							
							
						 
						
							2017-01-06 17:07:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								e7df488a92 
								
							 
						 
						
							
							
								
								Merge pull request  #989  from ishigoya/master  
							
							... 
							
							
							
							Keymap 
							
						 
						
							2017-01-06 17:28:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ishigoya 
								
							 
						 
						
							
							
							
							
								
							
							
								402e6c13a1 
								
							 
						 
						
							
							
								
								new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png  
							
							... 
							
							
							
							new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png
	modified:   keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/readme.md 
							
						 
						
							2017-01-06 17:53:04 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ishigoya 
								
							 
						 
						
							
							
							
							
								
							
							
								0bd03d698c 
								
							 
						 
						
							
							
								
								new file:   keyboards/ergodox/keymaps/ishigoya-jp/keymap.c  
							
							
							
						 
						
							2017-01-06 16:41:14 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								ca9a3dcb71 
								
							 
						 
						
							
							
								
								Fix unrelated spelling error  
							
							
							
						 
						
							2017-01-04 21:20:06 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								ccde1d8b5e 
								
							 
						 
						
							
							
								
								Add white fox to keyboards readme  
							
							
							
						 
						
							2017-01-04 21:19:32 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								e5c7b5d8fc 
								
							 
						 
						
							
							
								
								Merge pull request  #983  from common-nighthawk/master  
							
							... 
							
							
							
							adds personal keymap for ergodox optimized for macOS with Vim 
							
						 
						
							2017-01-04 23:41:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								6a59dfb4c6 
								
							 
						 
						
							
							
								
								Merge pull request  #984  from deadcyclo/master  
							
							... 
							
							
							
							Added the deadcyclo layout 
							
						 
						
							2017-01-04 23:41:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								ad290946f2 
								
							 
						 
						
							
							
								
								Merge pull request  #988  from jcowgar/master  
							
							... 
							
							
							
							Added Jeremy’s developers keymap for the Planck 
							
						 
						
							2017-01-04 23:39:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeremy Cowgar 
								
							 
						 
						
							
							
							
							
								
							
							
								5fca9ff4d5 
								
							 
						 
						
							
							
								
								Added Jeremy’s developers keymap for the Planck  
							
							
							
						 
						
							2017-01-04 10:51:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								262d31c389 
								
							 
						 
						
							
							
								
								Add whitefox readme  
							
							
							
						 
						
							2017-01-04 00:29:58 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								300c71a023 
								
							 
						 
						
							
							
								
								Remove unneeded define  
							
							
							
						 
						
							2017-01-04 00:05:18 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaleb Elwert 
								
							 
						 
						
							
							
							
							
								
							
							
								8377d5fdc5 
								
							 
						 
						
							
							
								
								Initial whitefox support  
							
							
							
						 
						
							2017-01-03 23:41:52 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Johan Lee 
								
							 
						 
						
							
							
							
							
								
							
							
								a85aefd27a 
								
							 
						 
						
							
							
								
								fix version macro making layer 3 sticky on deadcyclo layout  
							
							
							
						 
						
							2017-01-03 15:09:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Johan Lee 
								
							 
						 
						
							
							
							
							
								
							
							
								b23a963bec 
								
							 
						 
						
							
							
								
								Added the deadcyclo layout  
							
							
							
						 
						
							2017-01-02 19:12:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								ffc1d97672 
								
							 
						 
						
							
							
								
								Update config.h  
							
							
							
						 
						
							2017-01-02 09:57:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel 
								
							 
						 
						
							
							
							
							
								
							
							
								0de3a5d0b2 
								
							 
						 
						
							
							
								
								reverts change outside of personal keymap.  
							
							
							
						 
						
							2017-01-01 21:02:43 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel 
								
							 
						 
						
							
							
							
							
								
							
							
								acffbb480f 
								
							 
						 
						
							
							
								
								adds dedicated double-quote key.  
							
							
							
						 
						
							2017-01-01 20:09:30 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								847377fb43 
								
							 
						 
						
							
							
								
								Merge pull request  #980  from TerryMathews/master  
							
							... 
							
							
							
							Establish support for AMJPAD 
							
						 
						
							2016-12-31 13:38:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Oberschweiber 
								
							 
						 
						
							
							
							
							
								
							
							
								0aa413af44 
								
							 
						 
						
							
							
								
								Add support for supplementary planes for OS X  
							
							
							
						 
						
							2016-12-31 19:37:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									TerryMathews 
								
							 
						 
						
							
							
							
							
								
							
							
								925ed44405 
								
							 
						 
						
							
							
								
								Establish support for AMJPAD  
							
							
							
						 
						
							2016-12-31 13:19:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								6dbcc50f56 
								
							 
						 
						
							
							
								
								Merge pull request  #975  from fredizzimo/remove_temp_files  
							
							... 
							
							
							
							Remove extra file that has been commited by mistake 
							
						 
						
							2016-12-30 11:12:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								f98062081b 
								
							 
						 
						
							
							
								
								Merge pull request  #976  from fredizzimo/fix_makefile_on_cygwin  
							
							... 
							
							
							
							Fix makefile on cygwin 
							
						 
						
							2016-12-30 11:08:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								460bf008f5 
								
							 
						 
						
							
							
								
								Merge pull request  #973  from Wilba6582/keycode_refactor  
							
							... 
							
							
							
							Keycode refactor 
							
						 
						
							2016-12-30 11:07:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								07e266bbc6 
								
							 
						 
						
							
							
								
								Merge pull request  #971  from algernon/ergodox-ez/algernon  
							
							... 
							
							
							
							ergodox: Update algernon's keymap to v1.10 
							
						 
						
							2016-12-30 11:06:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jack Humbert 
								
							 
						 
						
							
							
							
							
								
							
							
								2eced29675 
								
							 
						 
						
							
							
								
								Merge pull request  #974  from fredizzimo/remove_malloc_from_sysex  
							
							... 
							
							
							
							API Sysex fixes 
							
						 
						
							2016-12-30 11:05:50 -05:00