summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-18 14:30:24 -0400
committerGitHub <noreply@github.com>2016-06-18 14:30:24 -0400
commitdb32864ce7029d758f57729cc2f75e051a28d0a2 (patch)
treef3ac60d9c826a9ad5ef5bc4d199efaddae156ba6 /keyboard/ergodox_ez/keymaps
parent1923cffd41d9d71cd9f434092654dba05513137b (diff)
downloadqmk_firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.tar.gz
qmk_firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.zip
Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff
Diffstat (limited to 'keyboard/ergodox_ez/keymaps')
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c2
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/keymap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
index d8911af412..131796fc5d 100644
--- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
@@ -1,6 +1,6 @@
#include "ergodox_ez.h"
#include "action_layer.h"
-#include "keymap_common.h"
+#include "keymap.h"
#include "keymap_extras/keymap_german.h"
#define UC_ASYMPTOTICALLY_EQUAL_TO 0
diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
index b63698ec6a..07e58a491b 100644
--- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
@@ -3,7 +3,7 @@
#include "action_layer.h"
#include "action_util.h"
#include "led.h"
-#include "keymap_common.h"
+#include "keymap.h"
#include "timer.h"
/*