Commit Graph

3 Commits (f2c32b3ea452827fe1378d870f519bfa6b7875e3)

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
Nic Aitch 7f3921bcb3 Update nic keymap 7 years ago
Nic Aitch fb0d4e96e8 Add nic keymap 7 years ago