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
This commit is contained in:
Balz Guenat
2017-08-07 21:54:06 +02:00
83 changed files with 2545 additions and 528 deletions
@@ -1,17 +1 @@
# The default keymap for the Bananasplit
```
-------------------------------------------------------------------------------------------
| Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Backspace |
-------------------------------------------------------------------------------------------
| Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ |
-------------------------------------------------------------------------------------------
| CapsLck | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
-------------------------------------------------------------------------------------------
| Shift | Z | X | C | V | B | N | M | , | . |RSFT_T(/)| Up |Light|
-------------------------------------------------------------------------------------------
| Ctrl | GUI | Alt | Enter | App | Space | Alt |Ctrl |Left |Down |Right|
-------------------------------------------------------------------------------------------
```
The `RSFT_T(/)` key works as `/` when tapped and as right shift when held.