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
..
IIgs	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
alps64	Fix port setting of alps64/matrix.c	2015-10-15 11:48:14 +09:00
atomic	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
atreus	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
ergodox_ez	Pull request 190 resolution with 'qmk/master' for merge	2016-03-21 17:18:53 -04:00
gh60	reverting gh60	2015-10-27 12:49:07 -04:00
ghost_squid	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
hbkb	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
hhkb	Add doc of HHKB original keycodes	2015-10-21 06:59:26 +09:00
hhkb_qmk	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
hid_liber	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
infinity	Change mbed sdk path	2015-04-24 16:27:40 +09:00
jd45	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
kitten_paw	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
kmac	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
lightpad	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
lightsaber	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
macway	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
mbed_onekey	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
nerd	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
onekey	onekey: Add V-USB build	2015-07-12 06:59:58 +09:00
phantom	Change TMK_DIR setting	2015-04-10 01:53:24 +09:00
planck	Pull request 190 resolution with 'qmk/master' for merge	2016-03-21 17:18:53 -04:00
preonic	bluetooth	2015-10-22 13:37:45 -04:00
quark	quark	2015-05-15 21:57:29 -04:00
retro_refit	Adding Retro_Refit Keyboard	2016-03-16 10:27:04 -05:00