Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							4225f0353c
							
						
					 | 
					
						
						
							
							Merge branch 'planck-jack'
						
						
						
						
						
						
					 | 
					
						2015-01-14 22:43:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							173dbe3b28
							
						
					 | 
					
						
						
							
							Create keymap_shane.c
						
						
						
						
						
						
					 | 
					
						2015-01-14 21:36:25 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e0d872ab7
							
						
					 | 
					
						
						
							
							sean
						
						
						
						
						
						
					 | 
					
						2015-01-13 18:05:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							98f486a633
							
						
					 | 
					
						
						
							
							atomic
						
						
						
						
						
						
					 | 
					
						2015-01-12 12:39:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							42fe42274f
							
						
					 | 
					
						
						
							
							names
						
						
						
						
						
						
					 | 
					
						2015-01-12 12:37:16 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6f2f878f9
							
						
					 | 
					
						
						
							
							dotcom
						
						
						
						
						
						
					 | 
					
						2015-01-05 16:32:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							33e2a6285f
							
						
					 | 
					
						
						
							
							dotcom
						
						
						
						
						
						
					 | 
					
						2015-01-05 16:27:03 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							2de53795d6
							
						
					 | 
					
						
						
							
							Update keymap_jack.c
						
						
						
						
						
						
					 | 
					
						2015-01-05 13:11:34 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed8d9a099d
							
						
					 | 
					
						
						
							
							added planck folder
						
						
						
						
						
						
					 | 
					
						2014-12-14 10:30:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							79849ee534
							
						
					 | 
					
						
						
							
							Update keymap_common.h
						
						
						
						
						
						
					 | 
					
						2014-12-12 12:12:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e3397ca8a
							
						
					 | 
					
						
						
							
							Update matrix.c
						
						
						
						
						
						
					 | 
					
						2014-12-12 12:12:06 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a8b9b8a2e
							
						
					 | 
					
						
						
							
							Update keymap_planck.c
						
						
						
						
						
						
					 | 
					
						2014-12-12 12:11:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4c4d6ad0a
							
						
					 | 
					
						
						
							
							Merge pull request #1 from charlesmartin/patch-2
						
						
						
						
						
						
						
						Update keymap_planck.c 
						
						
					 | 
					
						2014-12-11 17:42:46 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								charlesmartin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cc0d353a5
							
						
					 | 
					
						
						
							
							Update keymap_planck.c
						
						
						
						
						
						
					 | 
					
						2014-12-11 17:41:00 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9a1b9086f
							
						
					 | 
					
						
						
							
							led
						
						
						
						
						
						
					 | 
					
						2014-12-11 17:36:42 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c6770f18c
							
						
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2014-12-08 17:05:41 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jack Humbert
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c27cba5df
							
						
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2014-12-08 17:05:02 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jun Wako
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6f698dda0
							
						
					 | 
					
						
						
							
							usb_usb: Update for new core layout
						
						
						
						
						
						
					 | 
					
						2014-12-05 09:59:08 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							4192bce16b
							
						
					 | 
					
						
						
							
							hhkb: Change keymap and bootmagic salt key
						
						
						
						
						
						
					 | 
					
						2014-11-25 11:44:57 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc5693e0f1
							
						
					 | 
					
						
						
							
							Merge branch 'u2_fix'
						
						
						
						
						
						
					 | 
					
						2014-11-24 16:19:00 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							b92ea1f985
							
						
					 | 
					
						
						
							
							Fix endpoint buffer setting for AT90USB82/162.
						
						
						
						
						
						
					 | 
					
						2014-11-24 16:04:03 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed52ebb987
							
						
					 | 
					
						
						
							
							Merge branch 'merge_rn42'
						
						
						
						
						
						
					 | 
					
						2014-11-24 15:36:53 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2077cad45
							
						
					 | 
					
						
						
							
							Change key_t to keypos_t
						
						
						
						
						
						
					 | 
					
						2014-11-24 15:14:52 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							a996396045
							
						
					 | 
					
						
						
							
							Fix debug.h
						
						
						
						
						
						
					 | 
					
						2014-11-24 14:33:50 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							363950982a
							
						
					 | 
					
						
						
							
							Merge branch 'rn42' into merge_rn42
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	common.mk
	common/debug_config.h
	common/print.h 
						
						
					 | 
					
						2014-11-24 13:50:33 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							60096e11c7
							
						
					 | 
					
						
						
							
							Update doc
						
						
						
						
						
						
					 | 
					
						2014-11-23 13:44:11 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f96edaed6
							
						
					 | 
					
						
						
							
							Remove MCU dependent code from common/keyboard.c
						
						
						
						
						
						
					 | 
					
						2014-11-23 13:38:10 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							608ebe2686
							
						
					 | 
					
						
						
							
							Matrix power saving
						
						
						
						
						
						
					 | 
					
						2014-11-23 13:08:05 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2d830c07c
							
						
					 | 
					
						
						
							
							USB initialize when plug-in during battery powered
						
						
						
						
						
						
					 | 
					
						2014-11-20 17:24:56 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jun Wako
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb90ed6238
							
						
					 | 
					
						
						
							
							ps2_usb: Fix README
						
						
						
						
						
						
					 | 
					
						2014-11-20 16:47:40 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							09e6f71bff
							
						
					 | 
					
						
						
							
							adb_usb: Remove old comment of Makefile
						
						
						
						
						
						
					 | 
					
						2014-11-20 01:32:20 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							1961641463
							
						
					 | 
					
						
						
							
							Merge branch 'action_fix'
						
						
						
						
						
						
					 | 
					
						2014-11-18 04:10:48 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							a58b9ddbd5
							
						
					 | 
					
						
						
							
							Add initializer of debug_config for GCC < 4.6.0(#144)
						
						
						
						
						
						
					 | 
					
						2014-11-14 22:53:25 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							8180709132
							
						
					 | 
					
						
						
							
							Fix for 'unnamed field in initializer' GCC bug(Fix #143)
						
						
						
						
						
						
					 | 
					
						2014-11-14 17:49:48 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Simon Stapleton
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b0b8ee017
							
						
					 | 
					
						
						
							
							ignore files with trailing ~
						
						
						
						
						
						
					 | 
					
						2014-11-14 17:25:49 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							c49cb01002
							
						
					 | 
					
						
						
							
							Merge pull request #142 from 0mark/master
						
						
						
						
						
						
						
						fixed vusb variant of converter ps2usb 
						
						
					 | 
					
						2014-11-14 04:56:00 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Mark
							
						 
					 | 
					
						
						
						
						
							
						
						
							93915040e7
							
						
					 | 
					
						
						
							
							fixed vusb variant of converter ps2usb
						
						
						
						
						
						
					 | 
					
						2014-11-13 12:07:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c06b9031f
							
						
					 | 
					
						
						
							
							Add power control of key switch board
						
						
						
						
						
						
					 | 
					
						2014-10-02 09:58:47 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							821c719e98
							
						
					 | 
					
						
						
							
							Add action 'Momentary switching with Modifiers'
						
						
						
						
						
						
					 | 
					
						2014-09-29 10:29:33 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cec0bc9d6
							
						
					 | 
					
						
						
							
							Fix typo of variable name
						
						
						
						
						
						
					 | 
					
						2014-09-24 15:52:31 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							27967f2008
							
						
					 | 
					
						
						
							
							Add TMK converter support to Next converter
						
						
						
						
						
						
						
						- change protocol stack to LUFA 
						
						
					 | 
					
						2014-09-24 15:50:29 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfd2d969b4
							
						
					 | 
					
						
						
							
							Add keyboard LED control via Bluetooth
						
						
						
						
						
						
					 | 
					
						2014-09-22 14:20:49 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd3ab65ec3
							
						
					 | 
					
						
						
							
							Merge branch 'usb_usb_fix'
						
						
						
						
						
						
					 | 
					
						2014-09-22 10:53:35 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3f4f7d8c4
							
						
					 | 
					
						
						
							
							Merge branch 'scottjad-master' into usb_usb_fix
						
						
						
						
						
						
					 | 
					
						2014-09-22 10:52:27 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea524d7bef
							
						
					 | 
					
						
						
							
							Adhoc fix compile error of usb_usb
						
						
						
						
						
						
					 | 
					
						2014-09-22 10:42:20 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							2015027da3
							
						
					 | 
					
						
						
							
							Add FET swtich for battery ADC
						
						
						
						
						
						
					 | 
					
						2014-09-20 06:12:49 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Scott Jaderholm
							
						 
					 | 
					
						
						
						
						
							
						
						
							a59dea558e
							
						
					 | 
					
						
						
							
							usb_usb: Remove mention of downloading LUFA
						
						
						
						
						
						
					 | 
					
						2014-09-14 21:38:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Scott Jaderholm
							
						 
					 | 
					
						
						
						
						
							
						
						
							c35e3e8596
							
						
					 | 
					
						
						
							
							usb_usb: Remove mention of merged usb_hid branch
						
						
						
						
						
						
					 | 
					
						2014-09-14 21:37:20 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8dd18b421
							
						
					 | 
					
						
						
							
							Improve rn42_task time resolution
						
						
						
						
						
						
					 | 
					
						2014-09-05 11:37:05 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tmk
							
						 
					 | 
					
						
						
						
						
							
						
						
							38714e8c85
							
						
					 | 
					
						
						
							
							Update MEMO and remove a build option to save flash
						
						
						
						
						
						
					 | 
					
						2014-09-04 17:39:29 +09:00 | 
					
					
						
						
							
							
							
						
					 |