Commit Graph

3 Commits (2165f9d654a3c44fc51f2e6638807f1be21ff9da)

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