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	…
alps64	…
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	…
ghost_squid	…
hbkb	…
hhkb	…
hhkb_qmk	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
hid_liber	…
infinity	…
jd45	Addressed void* return warning in all keymaps	2016-03-10 11:28:34 -05:00
kitten_paw	…
kmac	…
lightpad	…
lightsaber	…
macway	…
mbed_onekey	…
nerd	…
onekey	…
phantom	…
planck	Pull request 190 resolution with 'qmk/master' for merge	2016-03-21 17:18:53 -04:00
preonic	…
quark	…
retro_refit	Adding Retro_Refit Keyboard	2016-03-16 10:27:04 -05:00