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
..
coloneljesus	Add language-switch for locking switch	8 years ago
default	Merge remote-tracking branch 'upstream/master' into bananasplit	8 years ago
hhkbanana	Merge remote-tracking branch 'upstream/master' into bananasplit	8 years ago
nic	Merge remote-tracking branch 'upstream/master' into bananasplit	8 years ago