Commit Graph

2 Commits (6895c4510e1e683bf2cfa4a78dbde57a2a8554e4)

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
7 years ago
Balz Guenat 15fbe6e233 add the bananasplit keyboard incl. default keymap. 7 years ago