From: coderkun <olli@coderkun.de>
Date: Sat, 1 Apr 2017 08:56:29 +0000 (+0200)
Subject: Merge branch 'master' into coderkun_neo2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=605c4129cc89e8fe647881108b0c9c79d4da1aea;p=qmk_firmware.git

Merge branch 'master' into coderkun_neo2
---

605c4129cc89e8fe647881108b0c9c79d4da1aea
diff --cc keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
index 9b33bbd6d,aaf75d58f..ff6d38f30
--- a/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
@@@ -311,8 -312,8 +311,10 @@@ uint16_t hex_to_keycode(uint8_t hex
          return NEO_E;
        case 0xF:
          return NEO_F;
+       default:
+         return KC_NO;
      }
    }
 +
 +  return KC_1 + (hex - 0x1);
  }