Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	e024c11f7a  
						 
						
							
							
								
								
								actually resolves conflicts in rgblight.c  
							
							 
							
							
							
							
						 
						
							2016-04-26 13:50:04 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	c37d52d213  
						 
						
							
							
								
								
								resolves conflicts in rgblight.c  
							
							 
							
							... 
							
							
							
							
							# Conflicts:
#	quantum/rgblight.c 
							
						 
						
							2016-04-26 13:48:36 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	27e3294909  
						 
						
							
							
								
								
								updates README, fixes typo in new_project.sh  
							
							 
							
							
							
							
						 
						
							2016-04-26 13:44:27 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	0edc7a9d87  
						 
						
							
							
								
								
								Merge branch 'master' of github.com:jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-04-26 14:25:45 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	ea091e7f1b  
						 
						
							
							
								
								
								Honing in on an interval that works for me  
							
							 
							
							
							
							
						 
						
							2016-04-26 14:25:35 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	bf56838fe9  
						 
						
							
							
								
								
								adds freq LUT for future use  
							
							 
							
							
							
							
						 
						
							2016-04-26 01:17:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	140b97a1cd  
						 
						
							
							
								
								
								adds delayed vibrato  
							
							 
							
							
							
							
						 
						
							2016-04-26 01:16:47 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	6274a216f8  
						 
						
							
							
								
								
								[Erez & Jack] Examples for advanced macro stuff  
							
							 
							
							
							
							
						 
						
							2016-04-26 05:25:31 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	aabcfd5b4e  
						 
						
							
							
								
								
								Merge pull request  #282  from jasontwong/master  
							
							 
							
							... 
							
							
							
							
							Add new keymap 
							
						 
						
							2016-04-25 06:57:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	28352f4619  
						 
						
							
							
								
								
								adds revisions of .hex files for planck/preonic  
							
							 
							
							
							
							
						 
						
							2016-04-25 01:01:41 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	0889cc0d9a  
						 
						
							
							
								
								
								removes old .hex files  
							
							 
							
							
							
							
						 
						
							2016-04-25 01:00:34 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	e7b6bb641c  
						 
						
							
							
								
								
								updates default voice, prunes voices  
							
							 
							
							
							
							
						 
						
							2016-04-25 00:59:47 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	170d9b7d15  
						 
						
							
							
								
								
								addresses memory limits concerns for atomic default makefile  
							
							 
							
							
							
							
						 
						
							2016-04-25 00:25:49 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9fb1e5441f  
						 
						
							
							
								
								
								updates preonic default keymap  
							
							 
							
							
							
							
						 
						
							2016-04-25 00:22:35 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	130a485bf7  
						 
						
							
							
								
								
								updates planck default keymap  
							
							 
							
							
							
							
						 
						
							2016-04-25 00:15:23 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jason T. Wong 
								
							 
						 
						
							
							
								
							
							
	9f8f34119a  
						 
						
							
							
								
								
								Compiled Hex File  
							
							 
							
							... 
							
							
							
							
							The keymap file to use without compilation. 
							
						 
						
							2016-04-24 22:14:09 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	f32f80cf32  
						 
						
							
							
								
								
								updating personal atomic keymap ( #285 )  
							
							 
							
							
							
							
						 
						
							2016-04-24 22:06:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	68532ced24  
						 
						
							
							
								
								
								Merge pull request  #280  from Twey/master  
							
							 
							
							... 
							
							
							
							
							Add `quantum/keymap_extras/keymap_plover.h` and a keymap. 
							
						 
						
							2016-04-24 20:33:38 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James ‘Twey’ Kay 
								
							 
						 
						
							
							
								
							
							
	5713083e91  
						 
						
							
							
								
								
								Add Twey's keymap  
							
							 
							
							
							
							
						 
						
							2016-04-25 01:08:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jason T. Wong 
								
							 
						 
						
							
							
								
							
							
	93da70a43a  
						 
						
							
							
								
								
								Update keymap image  
							
							 
							
							... 
							
							
							
							
							Why:
* The transparency made it ugly.
This change addresses the need by:
* Make transparent parts white. 
							
						 
						
							2016-04-23 23:36:41 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	def6853532  
						 
						
							
							
								
								
								adds voice iteration to planck default  
							
							 
							
							
							
							
						 
						
							2016-04-23 23:30:09 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jason T. Wong 
								
							 
						 
						
							
							
								
							
							
	762065578b  
						 
						
							
							
								
								
								Add new keymap  
							
							 
							
							... 
							
							
							
							
							Why:
* I want a custom keymap that suits my needs.
This change addresses the need by:
* Cloned default keymap.
* Customized layout.
* Updated README.
* Add an image created from keyboard layout editor. 
							
						 
						
							2016-04-23 23:21:13 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									James ‘Twey’ Kay 
								
							 
						 
						
							
							
								
							
							
	7ccfaf750d  
						 
						
							
							
								
								
								Add a keymap_extras header for Plover  
							
							 
							
							
							
							
						 
						
							2016-04-23 18:49:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eric Tang 
								
							 
						 
						
							
							
								
							
							
	eb09c450de  
						 
						
							
							
								
								
								Fix typo ( #276 )  
							
							 
							
							
							
							
						 
						
							2016-04-22 16:44:50 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	a718c53fe7  
						 
						
							
							
								
								
								adds more voice harmonics  
							
							 
							
							
							
							
						 
						
							2016-04-22 11:58:29 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	a8086126fe  
						 
						
							
							
								
								
								Merge remote-tracking branch 'origin/master'  
							
							 
							
							... 
							
							
							
							
							# Conflicts:
#	quantum/audio/voices.c 
							
						 
						
							2016-04-22 01:04:13 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	b1900c8dde  
						 
						
							
							
								
								
								adds fifth and fourth down voices  
							
							 
							
							
							
							
						 
						
							2016-04-22 01:02:50 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									IBNobody 
								
							 
						 
						
							
							
								
							
							
	082a0f313d  
						 
						
							
							
								
								
								fixed compiler warnings ( #273 )  
							
							 
							
							
							
							
						 
						
							2016-04-22 01:01:38 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	7b3f212500  
						 
						
							
							
								
								
								adds more voices, fixes macro redefines  
							
							 
							
							
							
							
						 
						
							2016-04-21 23:10:49 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	fa40e91b56  
						 
						
							
							
								
								
								Merge pull request  #271  from eltang/qmk_firmware/eeprom_wear_fix  
							
							 
							
							... 
							
							
							
							
							Update functions used to write to EEPROM 
							
						 
						
							2016-04-21 23:10:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eric Tang 
								
							 
						 
						
							
							
								
							
							
	620ac4b260  
						 
						
							
							
								
								
								Update functions used to write to EEPROM  
							
							 
							
							
							
							
						 
						
							2016-04-21 20:07:03 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	9828aba2a1  
						 
						
							
							
								
								
								adds multiple voices and the ability to iterate/deiterate between them  
							
							 
							
							
							
							
						 
						
							2016-04-21 18:14:25 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	a8fd65d86f  
						 
						
							
							
								
								
								Merge pull request  #265  from sboesebeck/master  
							
							 
							
							... 
							
							
							
							
							ErgodoxLayoutGenerator used 
							
						 
						
							2016-04-21 08:10:39 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	e89b806b85  
						 
						
							
							
								
								
								converts tabs to spaces  
							
							 
							
							
							
							
						 
						
							2016-04-21 00:40:00 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	73228f5e5d  
						 
						
							
							
								
								
								restructures audio, begins voicing  
							
							 
							
							
							
							
						 
						
							2016-04-21 00:37:45 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	2e60054951  
						 
						
							
							
								
								
								fade envelope  
							
							 
							
							
							
							
						 
						
							2016-04-20 23:16:39 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	2e303b40ae  
						 
						
							
							
								
								
								start of envelope function  
							
							 
							
							
							
							
						 
						
							2016-04-20 22:29:01 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	7d1a683607  
						 
						
							
							
								
								
								sounds for plover layout  
							
							 
							
							
							
							
						 
						
							2016-04-20 22:28:47 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	157ddccc2c  
						 
						
							
							
								
								
								start-up sound working, removes tick with some devices  
							
							 
							
							
							
							
						 
						
							2016-04-20 20:11:05 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	0fd093b400  
						 
						
							
							
								
								
								there is no on  
							
							 
							
							
							
							
						 
						
							2016-04-20 18:41:10 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	b0635e58eb  
						 
						
							
							
								
								
								delay isn't the problem here  
							
							 
							
							
							
							
						 
						
							2016-04-20 18:39:36 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	b8c932f9aa  
						 
						
							
							
								
								
								makes the plover keymap correct  
							
							 
							
							
							
							
						 
						
							2016-04-20 18:39:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	e065ff8cba  
						 
						
							
							
								
								
								changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,T - makes it work with custom keycodes  
							
							 
							
							
							
							
						 
						
							2016-04-20 22:34:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	17140ec082  
						 
						
							
							
								
								
								added some words about the ELG in the readme  
							
							 
							
							
							
							
						 
						
							2016-04-20 11:16:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Stephan Bösebeck 
								
							 
						 
						
							
							
								
							
							
	13244a259c  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/qmk_firmware  
							
							 
							
							
							
							
						 
						
							2016-04-20 11:15:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	f489ae1ac0  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/jackhumbert/tmk_keyboard  
							
							 
							
							
							
							
						 
						
							2016-04-20 01:08:27 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	de4690593c  
						 
						
							
							
								
								
								fixed startup audio with a 500ms delay  
							
							 
							
							
							
							
						 
						
							2016-04-20 01:08:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Erez Zukerman 
								
							 
						 
						
							
							
								
							
							
	a9ef1c0a03  
						 
						
							
							
								
								
								Merge pull request  #267  from nrrkeene/master  
							
							 
							
							... 
							
							
							
							
							Improved modifier keys, code 
							
						 
						
							2016-04-20 07:48:54 +03:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nicholas Keene 
								
							 
						 
						
							
							
								
							
							
	5319c2cd6e  
						 
						
							
							
								
								
								The Ordinary Layout is the layout you are looking for. Come and see.  
							
							 
							
							
							
							
						 
						
							2016-04-19 21:56:50 -05:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jack Humbert 
								
							 
						 
						
							
							
								
							
							
	462601f5e8  
						 
						
							
							
								
								
								breaking changes - restructuring audio.c a little  
							
							 
							
							
							
							
						 
						
							2016-04-19 21:25:48 -04:00