IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							ec62d9e85c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/jackhumbert/master'  
						
						... 
						
						
						
						# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h 
						
						
					 
					
						2016-03-22 20:39:05 -05:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							baeffd99da 
							
						 
					 
					
						
						
							
							Pull request 190 resolution with 'qmk/master' for merge  
						
						
						
						
					 
					
						2016-03-21 17:18:53 -04:00 
						 
				 
			
				
					
						
							
							
								IBNobody 
							
						 
					 
					
						
						
						
						
							
						
						
							eba9a7d74d 
							
						 
					 
					
						
						
							
							Adding LED function pointers  
						
						
						
						
					 
					
						2016-03-15 23:52:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							35393fa9dc 
							
						 
					 
					
						
						
							
							Merge pull request  #194  from DidierLoiseau/bépo-keymap-header  
						
						... 
						
						
						
						Keymap header for the BÉPO layout 
						
						
					 
					
						2016-03-14 13:42:47 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Kriesten 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc6eca44a 
							
						 
					 
					
						
						
							
							fixes an obvious typo to have DE_LCBR produce {  
						
						
						
						
					 
					
						2016-03-14 13:35:34 +01:00 
						 
				 
			
				
					
						
							
							
								Didier Loiseau 
							
						 
					 
					
						
						
						
						
							
						
						
							7c33f8493f 
							
						 
					 
					
						
						
							
							Keymap header for the BÉPO layout  
						
						
						
						
					 
					
						2016-03-13 23:22:21 +01:00 
						 
				 
			
				
					
						
							
							
								yoyoerx 
							
						 
					 
					
						
						
						
						
							
						
						
							641859df84 
							
						 
					 
					
						
						
							
							Addressed void* return warning in all keymaps  
						
						
						
						
					 
					
						2016-03-10 11:28:34 -05:00 
						 
				 
			
				
					
						
							
							
								Noah Andrews 
							
						 
					 
					
						
						
						
						
							
						
						
							ee1b94045e 
							
						 
					 
					
						
						
							
							Remove extraneous comma  
						
						
						
						
					 
					
						2016-03-04 10:53:58 -05:00 
						 
				 
			
				
					
						
							
							
								plgruener 
							
						 
					 
					
						
						
						
						
							
						
						
							4ca4322501 
							
						 
					 
					
						
						
							
							update neo keymap  
						
						
						
						
					 
					
						2016-03-03 10:25:23 +01:00 
						 
				 
			
				
					
						
							
							
								Kévin Letord 
							
						 
					 
					
						
						
						
						
							
						
						
							4a19cc054d 
							
						 
					 
					
						
						
							
							Fix FR_RCBR declaration in keymap_french.h  
						
						
						
						
					 
					
						2016-02-27 15:22:54 +01:00 
						 
				 
			
				
					
						
							
							
								Keller-Laminar 
							
						 
					 
					
						
						
						
						
							
						
						
							233af3a41c 
							
						 
					 
					
						
						
							
							Include Dvorak underscore and plus keys.  
						
						... 
						
						
						
						There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer. 
						
						
					 
					
						2016-02-22 13:06:26 -05:00 
						 
				 
			
				
					
						
							
							
								Vincent Pochet 
							
						 
					 
					
						
						
						
						
							
						
						
							1934e8a270 
							
						 
					 
					
						
						
							
							Add extra keymap for swiss french keyboard  
						
						
						
						
					 
					
						2016-02-20 14:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a6414eb257 
							
						 
					 
					
						
						
							
							Merge pull request  #145  from gerbercj/feature/atreus_astar  
						
						... 
						
						
						
						Add support for Atreus running on A-Star 
						
						
					 
					
						2016-02-17 21:18:13 -05:00 
						 
				 
			
				
					
						
							
							
								Chris Gerber 
							
						 
					 
					
						
						
						
						
							
						
						
							47dcec2945 
							
						 
					 
					
						
						
							
							Add support for Atreus running on A-Star  
						
						
						
						
					 
					
						2016-02-15 20:53:56 -05:00 
						 
				 
			
				
					
						
							
							
								joar 
							
						 
					 
					
						
						
						
						
							
						
						
							2f7cda63d0 
							
						 
					 
					
						
						
							
							Norwegian Colemak Ergodox and Norwegian key definitions  
						
						
						
						
					 
					
						2016-02-11 16:28:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a2c77fde 
							
						 
					 
					
						
						
							
							README changes  
						
						
						
						
					 
					
						2016-02-07 10:41:00 -05:00 
						 
				 
			
				
					
						
							
							
								Wojciech Siewierski 
							
						 
					 
					
						
						
						
						
							
						
						
							65b41e2e59 
							
						 
					 
					
						
						
							
							Use boolean AND instead of bitwise (possible typo)  
						
						... 
						
						
						
						Fortunately seems harmless. 
						
						
					 
					
						2016-02-07 11:48:28 +01:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							3c683aa9f2 
							
						 
					 
					
						
						
							
							Fixes CM_SCLN and updates docs for Colemak  
						
						
						
						
					 
					
						2016-02-05 16:28:24 +02:00 
						 
				 
			
				
					
						
							
							
								Fernando Mendonca 
							
						 
					 
					
						
						
						
						
							
						
						
							c29ad125a7 
							
						 
					 
					
						
						
							
							Fix 2 macros in the Nordic keymap  
						
						... 
						
						
						
						By testing I found out that, at least on Linux using the Swedish layout,
two macros present on this file were wrong, for the backslash and pipe
keys. Jack helped me find the correct combination for the backslash and
that led me to the right one for pipe. 
						
						
					 
					
						2016-02-05 01:50:54 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							7d6716bede 
							
						 
					 
					
						
						
							
							audio on reset  
						
						
						
						
					 
					
						2016-01-29 23:27:36 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							0a71166a2d 
							
						 
					 
					
						
						
							
							missing file  
						
						
						
						
					 
					
						2016-01-29 23:11:25 -05:00 
						 
				 
			
				
					
						
							
							
								Yang Liu 
							
						 
					 
					
						
						
						
						
							
						
						
							2647c7cd84 
							
						 
					 
					
						
						
							
							fix bugs in animation effects  
						
						
						
						
					 
					
						2016-01-24 17:19:33 -08:00 
						 
				 
			
				
					
						
							
							
								Yang Liu 
							
						 
					 
					
						
						
						
						
							
						
						
							ba9ac457b2 
							
						 
					 
					
						
						
							
							Integrate WS2812 code into quantum core  
						
						
						
						
					 
					
						2016-01-24 17:05:47 -08:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							24f2698fba 
							
						 
					 
					
						
						
							
							changes to the template  
						
						
						
						
					 
					
						2016-01-23 20:45:52 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							5143c59bdf 
							
						 
					 
					
						
						
							
							Merge branch 'audio' of  https://github.com/jackhumbert/tmk_keyboard  into smarkefile  
						
						
						
						
					 
					
						2016-01-23 20:34:05 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							544a49329c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/tmk_keyboard  into smarkefile  
						
						
						
						
					 
					
						2016-01-23 20:33:35 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							c753bfcc14 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/jackhumbert/tmk_keyboard  into audio  
						
						
						
						
					 
					
						2016-01-23 20:32:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a820533ab7 
							
						 
					 
					
						
						
							
							keymap.c changes, disable grep stuff  
						
						
						
						
					 
					
						2016-01-20 00:15:29 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							eb61700912 
							
						 
					 
					
						
						
							
							better integrations  
						
						
						
						
					 
					
						2016-01-20 00:06:52 -05:00 
						 
				 
			
				
					
						
							
							
								plgruener 
							
						 
					 
					
						
						
						
						
							
						
						
							da09312dd5 
							
						 
					 
					
						
						
							
							complete keymap_german.h (all alphanumerics)  
						
						... 
						
						
						
						add 'DE_'-prefixed aliases for all alphanumerics, so it becomes
immediatly obvious which layout we are assuming. 
						
						
					 
					
						2016-01-19 20:04:08 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Eichinger 
							
						 
					 
					
						
						
						
						
							
						
						
							48eb980c2a 
							
						 
					 
					
						
						
							
							Add defines for CtrlAltGui modifiers  
						
						
						
						
					 
					
						2016-01-18 21:56:00 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							dfe7004bc5 
							
						 
					 
					
						
						
							
							new keymap folder structure and makefile magic  
						
						
						
						
					 
					
						2016-01-16 00:52:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							4faddd3449 
							
						 
					 
					
						
						
							
							working  
						
						
						
						
					 
					
						2016-01-16 00:06:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							6e3c36360e 
							
						 
					 
					
						
						
							
							sounds  
						
						
						
						
					 
					
						2016-01-15 23:10:30 -05:00 
						 
				 
			
				
					
						
							
							
								Stephan Bösebeck 
							
						 
					 
					
						
						
						
						
							
						
						
							e44c30f203 
							
						 
					 
					
						
						
							
							using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination  
						
						
						
						
					 
					
						2016-01-15 15:55:00 +01:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							4c100dbbef 
							
						 
					 
					
						
						
							
							note seq, start-up beeps, function beeps  
						
						
						
						
					 
					
						2016-01-13 00:25:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							0f867796de 
							
						 
					 
					
						
						
							
							timer 3  
						
						
						
						
					 
					
						2016-01-11 17:52:35 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							29de37d5c0 
							
						 
					 
					
						
						
							
							pwm audio  
						
						
						
						
					 
					
						2016-01-11 16:53:33 -05:00 
						 
				 
			
				
					
						
							
							
								Sébastien Pérochon 
							
						 
					 
					
						
						
						
						
							
						
						
							48eff6dd89 
							
						 
					 
					
						
						
							
							quantum: Add French keymap for OSX (keymap_french_osx)  
						
						
						
						
					 
					
						2016-01-05 10:49:36 +01: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 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							11d6e66979 
							
						 
					 
					
						
						
							
							atomic hex  
						
						
						
						
					 
					
						2015-11-21 15:01:33 -05:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							407f41cd9a 
							
						 
					 
					
						
						
							
							[Jack & Erez] Adds standalone versions of Hyper and Meh  
						
						
						
						
					 
					
						2015-11-10 04:18:44 +02:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ec585ed8 
							
						 
					 
					
						
						
							
							[Erez & Jack] Adds Meh key (Hyper without Win/Cmd)  
						
						
						
						
					 
					
						2015-11-10 04:14:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							6485c7d7da 
							
						 
					 
					
						
						
							
							nkro info  
						
						
						
						
					 
					
						2015-11-05 12:07:03 -05:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							eb2795b4d6 
							
						 
					 
					
						
						
							
							atomic up-to-date  
						
						
						
						
					 
					
						2015-10-30 00:48:17 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							39915b1748 
							
						 
					 
					
						
						
							
							homebrew instructions  
						
						
						
						
					 
					
						2015-10-29 15:12:51 -04:00 
						 
				 
			
				
					
						
							
							
								Erez Zukerman 
							
						 
					 
					
						
						
						
						
							
						
						
							4b0c54324a 
							
						 
					 
					
						
						
							
							Adds Hyper key, tweaks ErgoDox EZ default keymap  
						
						
						
						
					 
					
						2015-10-29 00:16:53 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							8643e01286 
							
						 
					 
					
						
						
							
							merging  
						
						
						
						
					 
					
						2015-10-28 13:54:41 -04:00