From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 12 Jan 2017 23:44:25 +0000 (-0600)
Subject: Merge branch 'master' into don
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=51deb8fcd52405709b3554815435e4eb00ade961;p=qmk_firmware.git

Merge branch 'master' into don
---

51deb8fcd52405709b3554815435e4eb00ade961
diff --cc keyboards/ergodox/keymaps/default/keymap.c
index f7a82cfa1,4477cab31..82ef5766d
--- a/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@@ -6,9 -6,13 +6,14 @@@
  #define BASE 0 // default layer
  #define SYMB 1 // symbols
  #define MDIA 2 // media keys
 +#define PLVR 3 // Plover layer
  
- #define EPRM M(1) // Macro 1: Reset EEPROM
+ enum custom_keycodes {
+   PLACEHOLDER = SAFE_RANGE, // can always be here
+   EPRM,
+   VRSN,
+   RGB_SLD
+ };
  
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap 0: Basic layer