diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
| commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
| tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/xd75/keymaps/emilyh | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/xd75/keymaps/emilyh')
| -rw-r--r-- | keyboards/xd75/keymaps/emilyh/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/xd75/keymaps/emilyh/rules.mk | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/xd75/keymaps/emilyh/keymap.c b/keyboards/xd75/keymaps/emilyh/keymap.c index 034bb55ac8..04c239636d 100644 --- a/keyboards/xd75/keymaps/emilyh/keymap.c +++ b/keyboards/xd75/keymaps/emilyh/keymap.c @@ -164,10 +164,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }, }; -const uint16_t PROGMEM fn_actions[] = { - -}; - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function diff --git a/keyboards/xd75/keymaps/emilyh/rules.mk b/keyboards/xd75/keymaps/emilyh/rules.mk index d4e08cfb26..52a8f38d45 100644 --- a/keyboards/xd75/keymaps/emilyh/rules.mk +++ b/keyboards/xd75/keymaps/emilyh/rules.mk @@ -13,6 +13,3 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -ifndef QUANTUM_DIR - include ../../../../Makefile -endif |