Stephen Tudor 
							
						 
					 
					
						
						
						
						
							
						
						
							fa72689145 
							
						 
					 
					
						
						
							
							Merge branch 'master' into smt/planck  
						
						... 
						
						
						
						* master:
  Clarify license on abnt2 keymap (#1038 )
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help` 
						
						
					 
					
						2017-01-28 00:51:07 -05:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							ec05f65421 
							
						 
					 
					
						
						
							
							Merge pull request  #1043  from potz/patch-1  
						
						... 
						
						
						
						Clarify license on abnt2 keymap (#1038 ) 
						
						
					 
					
						2017-01-27 18:40:59 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							e364b2267a 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 18:35:59 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							128640a7df 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 18:34:58 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							646d1f83a5 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 18:31:23 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							143a4ff78f 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 18:19:12 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							00010b47bc 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:54:48 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							757a79636b 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:54:14 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							35737ee07f 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:51:29 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							d51ad5db0f 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:47:43 -08:00 
						 
				 
			
				
					
						
							
							
								lucwastiaux 
							
						 
					 
					
						
						
						
						
							
						
						
							f6feee8167 
							
						 
					 
					
						
						
							
							eliminate references to shell_layer  
						
						
						
						
					 
					
						2017-01-28 09:45:13 +08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							223494e691 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:44:58 -08:00 
						 
				 
			
				
					
						
							
							
								lucwastiaux 
							
						 
					 
					
						
						
						
						
							
						
						
							a1c53d0f93 
							
						 
					 
					
						
						
							
							documented dual mode capslock  
						
						
						
						
					 
					
						2017-01-28 09:42:55 +08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							3df44ecfc8 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 17:08:57 -08:00 
						 
				 
			
				
					
						
							
							
								milestogo 
							
						 
					 
					
						
						
						
						
							
						
						
							cb2d4fb80b 
							
						 
					 
					
						
						
							
							split kinesis layout into ergodox and planck style symbol layers  
						
						
						
						
					 
					
						2017-01-27 16:45:18 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							858efff8e5 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 16:27:36 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							6a54982324 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 16:21:25 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							5942b0f103 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 14:54:42 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							0eebccb283 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 14:51:58 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							d524b3f5e5 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 14:26:21 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a04929f2 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 14:21:31 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							9adb6f777b 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 14:14:19 -08:00 
						 
				 
			
				
					
						
							
							
								Potiguar Faga 
							
						 
					 
					
						
						
						
						
							
						
						
							2fe18a50ec 
							
						 
					 
					
						
						
							
							Clarify license on abnt2 keymap ( #1038 )  
						
						
						
						
					 
					
						2017-01-27 18:22:44 -02:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							5c277651a3 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 11:30:25 -08:00 
						 
				 
			
				
					
						
							
							
								folkert4 
							
						 
					 
					
						
						
						
						
							
						
						
							8c794d73fa 
							
						 
					 
					
						
						
							
							Added Espynn's keymap  
						
						
						
						
					 
					
						2017-01-27 13:51:39 -05:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							69581f47d5 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 10:39:31 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							bc68d4ef2c 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 10:38:03 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							4bba3be825 
							
						 
					 
					
						
						
							
							Updated License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 10:35:54 -08:00 
						 
				 
			
				
					
						
							
							
								skullydazed 
							
						 
					 
					
						
						
						
						
							
						
						
							228e4add0b 
							
						 
					 
					
						
						
							
							Created License Clarification (markdown)  
						
						
						
						
					 
					
						2017-01-27 10:02:33 -08:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a28f689387 
							
						 
					 
					
						
						
							
							Merge pull request  #869  from dylanjgscott/master  
						
						... 
						
						
						
						Use `type cmp` to test for cmp in Makefile 
						
						
					 
					
						2017-01-27 11:23:02 -05:00 
						 
				 
			
				
					
						
							
							
								lucwastiaux 
							
						 
					 
					
						
						
						
						
							
						
						
							93c1bfa646 
							
						 
					 
					
						
						
							
							dual capslock functionality, activating shell nav or brackets  
						
						
						
						
					 
					
						2017-01-27 23:55:33 +08:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							d7aa4724fb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-27 15:24:08 +01:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							13fa63b192 
							
						 
					 
					
						
						
							
							[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys  
						
						
						
						
					 
					
						2017-01-27 13:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							712f3de16f 
							
						 
					 
					
						
						
							
							Merge pull request  #1035  from qmk/qmk_org_changes  
						
						... 
						
						
						
						Updated urls due to transfer to qmk org 
						
						
					 
					
						2017-01-27 00:28:46 -05:00 
						 
				 
			
				
					
						
							
							
								Luke Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							cfc4149712 
							
						 
					 
					
						
						
							
							Add ability to use tap macros without using functions  
						
						
						
						
					 
					
						2017-01-27 10:28:42 +11:00 
						 
				 
			
				
					
						
							
							
								Albert Pretorius 
							
						 
					 
					
						
						
						
						
							
						
						
							fffe76a7b7 
							
						 
					 
					
						
						
							
							albert ergodox keymap  
						
						
						
						
					 
					
						2017-01-26 20:07:47 +00:00 
						 
				 
			
				
					
						
							
							
								Nic Aitch 
							
						 
					 
					
						
						
						
						
							
						
						
							890ecf6a2a 
							
						 
					 
					
						
						
							
							Update readme  
						
						
						
						
					 
					
						2017-01-26 09:31:40 -06:00 
						 
				 
			
				
					
						
							
							
								Nic Aitch 
							
						 
					 
					
						
						
						
						
							
						
						
							3131d65563 
							
						 
					 
					
						
						
							
							Add avrdude target  
						
						
						
						
					 
					
						2017-01-26 09:31:27 -06:00 
						 
				 
			
				
					
						
							
							
								Luke Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							87bc36253d 
							
						 
					 
					
						
						
							
							Fix documentation for TMK actions  
						
						
						
						
					 
					
						2017-01-26 22:44:22 +11:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							8a645aa9ad 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2017-01-26 11:56:32 +01:00 
						 
				 
			
				
					
						
							
							
								Damien 
							
						 
					 
					
						
						
						
						
							
						
						
							b7b94bfb13 
							
						 
					 
					
						
						
							
							Merge pull request  #17  from qmk/master  
						
						... 
						
						
						
						Merged from QMK project 
						
						
					 
					
						2017-01-26 09:05:55 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c9ca368008 
							
						 
					 
					
						
						
							
							replace jackhumbert with qmk  
						
						
						
						
					 
					
						2017-01-26 01:52:43 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							aac7c0aa4d 
							
						 
					 
					
						
						
							
							Merge pull request  #1029  from SjB/qmk_infinity60  
						
						... 
						
						
						
						fix: infinity60 keyboard was not using quantum features. 
						
						
					 
					
						2017-01-26 01:28:44 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							0212a30aa6 
							
						 
					 
					
						
						
							
							Merge pull request  #1033  from smt/smt/preonic  
						
						... 
						
						
						
						Add smt's keymap for Preonic 
						
						
					 
					
						2017-01-26 01:27:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							1b20243092 
							
						 
					 
					
						
						
							
							Add gitter image, start update to qmk org  
						
						
						
						
					 
					
						2017-01-26 01:26:17 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Tudor 
							
						 
					 
					
						
						
						
						
							
						
						
							63e406eca4 
							
						 
					 
					
						
						
							
							Add smt keymap for Planck  
						
						
						
						
					 
					
						2017-01-26 00:24:51 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Tudor 
							
						 
					 
					
						
						
						
						
							
						
						
							6546dddddb 
							
						 
					 
					
						
						
							
							Remove COLEMAK from preonic_keycodes enum  
						
						
						
						
					 
					
						2017-01-25 10:57:42 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							7e3962f36a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:jackhumbert/qmk_firmware  
						
						
						
						
					 
					
						2017-01-25 10:02:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							938422ce99 
							
						 
					 
					
						
						
							
							layer defines to enum  
						
						
						
						
					 
					
						2017-01-25 10:02:01 -05:00 
						 
				 
			
				
					
						
							
							
								Brendan Johan Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							8af48194f2 
							
						 
					 
					
						
						
							
							[deadcyclo layout] Added lotsof new emojis and some new unicode keys  
						
						
						
						
					 
					
						2017-01-25 15:16:38 +01:00