Merge branch 'master' into coderkun_neo2

2017-04-01 10:56:29 +02:00
parent b0ade6dc98 3448d5d487
commit 605c4129cc
586 changed files with 32066 additions and 5519 deletions
--- a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
@@ -311,6 +311,8 @@ uint16_t hex_to_keycode(uint8_t hex)
        return NEO_E;
      case 0xF:
        return NEO_F;
+      default:
+        return KC_NO;
    }
  }