Commit Graph

3 Commits

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
2017-08-07 21:54:06 +02:00
Nic Aitch
4a5c948561 Port true_banana as default 2017-08-06 22:46:44 -04:00
Balz Guenat
15fbe6e233 add the bananasplit keyboard incl. default keymap. 2017-08-03 03:51:34 +02:00