Commit Graph

3 Commits (7260fc3eef98fb7b0e2ed24d3d0d14cf2e613000)

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 4a5c948561 Port true_banana as default 8 years ago
Balz Guenat 15fbe6e233 add the bananasplit keyboard incl. default keymap. 8 years ago