Zach White ac3b7d79e0 Merge remote-tracking branch 'origin/master' into develop ... Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py		2020-11-22 08:28:53 -08:00
..
meridian	Meridian initial commit (#10196)	2020-09-17 20:17:22 -07:00
prime_e	Updates to Talljoe's Keymaps (#10115)	2020-11-06 17:16:22 -08:00
prime_l	Remove HD44780 References, Part 4 (#10735)	2020-11-15 08:35:14 -08:00
prime_m	Remove HD44780 References, Part 4 (#10735)	2020-11-15 08:35:14 -08:00
prime_o	Remove HD44780 References, Part 4 (#10735)	2020-11-15 08:35:14 -08:00
prime_r	Change ?= to = in keyboard rules.mk (#9390)	2020-06-15 03:06:10 -07:00