Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into bananasplit | Balz Guenat | 2017-08-07 | 1 | -8/+8 |
| | | | | | | | | | | # 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 | ||||
* | Update nic keymap | Nic Aitch | 2017-08-06 | 1 | -5/+7 |
| | |||||
* | Add nic keymap | Nic Aitch | 2017-08-06 | 1 | -0/+43 |