Merge remote-tracking branch 'upstream/master' into bananasplit
authorBalz Guenat <balz.guenat@gmail.com>
Mon, 7 Aug 2017 19:54:06 +0000 (21:54 +0200)
committerBalz Guenat <balz.guenat@gmail.com>
Mon, 7 Aug 2017 19:54:06 +0000 (21:54 +0200)
commitd18df8ef7a7e0528a29fdc96d4843ace54605121
tree44f75b9bccd3efa130d622736726a5f1c83531f6
parent308bec28bb76f4305d0f084252d7cf207f1b3d83
parent933701c2129c0c585ecd8ba37c41b091a7dc687f
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
keyboards/bananasplit/bananasplit.h
keyboards/bananasplit/keymaps/default/readme.md
keyboards/bananasplit/keymaps/hhkbanana/keymap.c
keyboards/bananasplit/keymaps/nic/keymap.c