That-Canadian
								
							 
						 | 
						
							
							
							
							
								
							
							
								09e5885e45
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2017-08-13 14:11:25 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4be711af1
								
							
						 | 
						
							
							
								
								fix for issue #1568
							
							
							
							
							
						 | 
						
							2017-08-12 12:15:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								430151dd51
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							# Conflicts:
#	docs/faq_keymap.md 
							
						 | 
						
							2017-08-12 12:14:33 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								175db1a549
								
							
						 | 
						
							
							
								
								fix code block formatting
							
							
							
							
							
						 | 
						
							2017-08-11 23:13:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ad103fa51
								
							
						 | 
						
							
							
								
								add description of new option to docs and add option (commented out) into template.
							
							
							
							
							
						 | 
						
							2017-08-11 16:54:10 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								188ed682e3
								
							
						 | 
						
							
							
								
								add short comment to grave_esc_ctrl_override
							
							
							
							
							
						 | 
						
							2017-08-11 16:54:10 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								897ceac26c
								
							
						 | 
						
							
							
								
								add option to let ctrl override shift/gui for the GRAVE_ESC.
							
							
							
							
							
							
							
							This enables the ctrl+shift+esc shortcut to task manager on windows. 
							
						 | 
						
							2017-08-11 16:54:10 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e67cc9c80
								
							
						 | 
						
							
							
								
								add description of new option to docs and add option (commented out) into template.
							
							
							
							
							
						 | 
						
							2017-08-11 22:20:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd38273f6f
								
							
						 | 
						
							
							
								
								add short comment to grave_esc_ctrl_override
							
							
							
							
							
						 | 
						
							2017-08-11 21:43:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b8eed9f29
								
							
						 | 
						
							
							
								
								add option to let ctrl override shift/gui for the GRAVE_ESC.
							
							
							
							
							
							
							
							This enables the ctrl+shift+esc shortcut to task manager on windows. 
							
						 | 
						
							2017-08-11 18:53:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								88198a9606
								
							
						 | 
						
							
							
								
								move qmk version to very top, exclude when git isn't available
							
							
							
							
							
						 | 
						
							2017-08-10 18:54:14 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								6895c4510e
								
							
						 | 
						
							
							
								
								fix default layer songs
							
							
							
							
							
						 | 
						
							2017-08-10 16:52:35 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dwrz
								
							 
						 | 
						
							
							
							
							
								
							
							
								70407a1b67
								
							
						 | 
						
							
							
								
								Add config.h to piemod keymap.
							
							
							
							
							
						 | 
						
							2017-08-10 14:58:15 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dwrz
								
							 
						 | 
						
							
							
							
							
								
							
							
								3fa32867ad
								
							
						 | 
						
							
							
								
								Remove makefile from Let's Split piemod.
							
							
							
							
							
						 | 
						
							2017-08-10 14:58:15 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dwrz
								
							 
						 | 
						
							
							
							
							
								
							
							
								72b7067489
								
							
						 | 
						
							
							
								
								Add piemod keymaps for Let's Split and Planck.
							
							
							
							
							
						 | 
						
							2017-08-10 14:58:15 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									That-Canadian
								
							 
						 | 
						
							
							
							
							
								
							
							
								48a89ad864
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2017-08-09 23:17:48 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ryan Sullivan
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5ab2412ab
								
							
						 | 
						
							
							
								
								Update readme
							
							
							
							
							
							
							
							Fixed link and small cleanup 
							
						 | 
						
							2017-08-09 21:03:05 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ryan Sullivan
								
							 
						 | 
						
							
							
							
							
								
							
							
								78ae28f24c
								
							
						 | 
						
							
							
								
								Add 'boardy' keymap
							
							
							
							
							
							
							
							Initial version of my personal layout for my keyboard Boardy 
							
						 | 
						
							2017-08-09 21:03:05 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ryan Sullivan
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6ed990d58
								
							
						 | 
						
							
							
								
								Rename 'base' to 'default'
							
							
							
							
							
							
							
							Moves Eagleheardt's base layout to the default one for the Org60.  Also changed to use the right header file. 
							
						 | 
						
							2017-08-09 21:03:05 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ryan Sullivan
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa660d61ea
								
							
						 | 
						
							
							
								
								Add Org60 keyboard
							
							
							
							
							
							
							
							This makes some small changes to the XD60 configuration.  Also moves Eagleheardt's base keymap. 
							
						 | 
						
							2017-08-09 21:03:05 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jasonm23
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2e24354e1
								
							
						 | 
						
							
							
								
								Add TKL keymap for GON NerdTKL
							
							
							
							
							
						 | 
						
							2017-08-09 10:19:39 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ethan Madden
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b70b6a990
								
							
						 | 
						
							
							
								
								Readmes!
							
							
							
							
							
						 | 
						
							2017-08-08 23:31:56 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ethan Madden
								
							 
						 | 
						
							
							
							
							
								
							
							
								daa5cee065
								
							
						 | 
						
							
							
								
								Added my personal layout
							
							
							
							
							
							
							
							added RGB controls to my keymap 
							
						 | 
						
							2017-08-08 23:31:56 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ethan Madden
								
							 
						 | 
						
							
							
							
							
								
							
							
								33a87c132c
								
							
						 | 
						
							
							
								
								Base JC65 config
							
							
							
							
							
							
							
							jc65 builds properly, haven't test flashed yet
Enabled RGB backlighting
disabled some other features to save some space 
							
						 | 
						
							2017-08-08 23:31:56 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									skullY
								
							 
						 | 
						
							
							
							
							
								
							
							
								087d00f769
								
							
						 | 
						
							
							
								
								commit line ending differences
							
							
							
							
							
						 | 
						
							2017-08-08 16:45:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								26d348b6d1
								
							
						 | 
						
							
							
								
								move version info to the top of the output
							
							
							
							
							
						 | 
						
							2017-08-08 16:06:45 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								5210f94a56
								
							
						 | 
						
							
							
								
								add version to make output
							
							
							
							
							
						 | 
						
							2017-08-08 16:06:45 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Danny Nguyen
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1536a3f54
								
							
						 | 
						
							
							
								
								Change installation of avr-libc to avr-gcc, now that avr-libc is integrated into the avr-gcc build
							
							
							
							
							
						 | 
						
							2017-08-08 10:03:19 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								3815067377
								
							
						 | 
						
							
							
								
								Fixed gaming layer
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								114565fe81
								
							
						 | 
						
							
							
								
								Rename SHIFT macro to BV_64
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9d755b6f4
								
							
						 | 
						
							
							
								
								Small gaming layer update
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3e1d9a8cc
								
							
						 | 
						
							
							
								
								Added support for locking One Shot modifiers.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								02f405708b
								
							
						 | 
						
							
							
								
								Remove hex print code.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								916c4d799d
								
							
						 | 
						
							
							
								
								Added NKRO to nyquist layout.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc59e093ec
								
							
						 | 
						
							
							
								
								Updated ergodox profile
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								7935f563e9
								
							
						 | 
						
							
							
								
								Updated nyquist gaming layout.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fc4a664dc
								
							
						 | 
						
							
							
								
								Added initial key lock documentation.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e1be7c792
								
							
						 | 
						
							
							
								
								Initial implementation of the key_lock feature.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a9fb7c96b
								
							
						 | 
						
							
							
								
								Added readme, fixed eql vs plus
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cb413b6b7
								
							
						 | 
						
							
							
								
								Updated licensing
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								b66a9af352
								
							
						 | 
						
							
							
								
								Finished initial Nyquist keymap.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb91d9008b
								
							
						 | 
						
							
							
								
								Additional keymap updates.
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fredric Silberberg
								
							 
						 | 
						
							
							
							
							
								
							
							
								1219da753b
								
							
						 | 
						
							
							
								
								Initial nyquist keymap
							
							
							
							
							
						 | 
						
							2017-08-08 10:02:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								107d8031e5
								
							
						 | 
						
							
							
								
								update priyadi's keymap config
							
							
							
							
							
						 | 
						
							2017-08-07 22:36:05 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								1a070d6f6f
								
							
						 | 
						
							
							
								
								let planck keymaps use KEYMAP
							
							
							
							
							
						 | 
						
							2017-08-07 22:04:37 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jack Humbert
								
							 
						 | 
						
							
							
							
							
								
							
							
								e966854a65
								
							
						 | 
						
							
							
								
								Merge pull request #1558 from BalzGuenat/bananasplit
							
							
							
							
							
							
							
							Merged my Bananasplit port with Nic's. 
							
						 | 
						
							2017-08-07 17:09:36 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								3961e14209
								
							
						 | 
						
							
							
								
								remove duplicate readme
							
							
							
							
							
						 | 
						
							2017-08-07 22:26:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Balz Guenat
								
							 
						 | 
						
							
							
							
							
								
							
							
								d18df8ef7a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into bananasplit
							
							
							
							
							
							
							
							# Conflicts:
#	keyboards/bananasplit/Makefile
#	keyboards/bananasplit/bananasplit.c
#	keyboards/bananasplit/bananasplit.h
#	keyboards/bananasplit/config.h
#	keyboards/bananasplit/keymaps/default/keymap.c
#	keyboards/bananasplit/rules.mk 
							
						 | 
						
							2017-08-07 21:54:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									That-Canadian
								
							 
						 | 
						
							
							
							
							
								
							
							
								933701c212
								
							
						 | 
						
							
							
								
								Updated .gitignore to properly have the master changes
							
							
							
							
							
						 | 
						
							2017-08-07 09:06:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									That-Canadian
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f58a8f842
								
							
						 | 
						
							
							
								
								Line endings issue for uk78?
							
							
							
							
							
						 | 
						
							2017-08-07 09:06:53 -04:00 | 
						
						
							
							
							
							
								
							
							
						 |