summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
diff options
context:
space:
mode:
authorChristopher Browne2016-06-21 17:54:12 -0400
committerChristopher Browne2016-06-21 17:54:12 -0400
commitee3c7892ad585e2e702d8975420d25ae052d97bb (patch)
tree71c23600099fe5670482f8900d787dbc7c9551b2 /keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
parent2d314810086684883329af730d8f5e8ecd0506b0 (diff)
parent1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
index 19e539006..4a9ceb4ef 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
@@ -1,19 +1,17 @@
#include "ergodox_ez.h"
#include "debug.h"
#include "action_layer.h"
-#include "keymap_extras/keymap_french.h"
-#include "keymap_extras/keymap_neo2.h"
-#include "keymap_extras/keymap_uk.h"
-#include "keymap_extras/keymap_colemak.h"
-#include "keymap_extras/keymap_french_osx.h"
-#include "keymap_extras/keymap_nordic.h"
-#include "keymap_extras/keymap_dvorak.h"
-#include "keymap_extras/keymap_german.h"
-#include "keymap_extras/keymap_norwegian.c"
-#include "keymap_extras/keymap_fr_ch.h"
-#include "keymap_extras/keymap_german_osx.h"
-#include "keymap_extras/keymap_spanish.h"
-#include "keymap_extras/keymap_bepo.h"
+#include "keymap_neo2.h"
+#include "keymap_uk.h"
+#include "keymap_colemak.h"
+#include "keymap_nordic.h"
+#include "keymap_dvorak.h"
+#include "keymap_german.h"
+#include "keymap_norwegian.c"
+#include "keymap_fr_ch.h"
+#include "keymap_german_osx.h"
+#include "keymap_spanish.h"
+#include "keymap_bepo.h"
/**