James Young 4279b14adf Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk		2021-08-19 11:32:23 -07:00
..
ansi	Merge remote-tracking branch 'upstream/master' into develop	2021-08-19 11:32:23 -07:00
iso	[Keyboard] Fix default keymap for GMMK Pro Iso (#13980)	2021-08-13 04:47:20 +10:00
keymaps	[Keymap] Add jonavin user space / common functions (#13876)	2021-08-19 10:45:49 -07:00
config.h	Make default keymap for GMMK Pro reflect stock (#13850)	2021-08-09 10:04:58 -07:00
halconf.h	GMMK Pro RGB Support (#13147)	2021-06-10 11:40:25 +10:00
mcuconf.h	GMMK Pro RGB Support (#13147)	2021-06-10 11:40:25 +10:00
pro.c	[Keyboard] Split GMMK Pro PCBs into separate revisions (#13570)	2021-07-19 17:57:19 -07:00
pro.h	[Keyboard] Split GMMK Pro PCBs into separate revisions (#13570)	2021-07-19 17:57:19 -07:00