Commit Graph

2 Commits (bc59e093ec8535bb23e60ffcc0df4c23e042f052)

Author SHA1 Message Date
Balz Guenat d18df8ef7a Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
#	keyboards/bananasplit/Makefile
#	keyboards/bananasplit/bananasplit.c
#	keyboards/bananasplit/bananasplit.h
#	keyboards/bananasplit/config.h
#	keyboards/bananasplit/keymaps/default/keymap.c
#	keyboards/bananasplit/rules.mk
8 years ago
Nic Aitch ba59b2d97e Port hhkbanana 8 years ago