g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation issues after the merge

daktil_manuform
Didier Loiseau 2016-09-11 02:19:55 +02:00
parent b9014c7575
commit 1aeb59335f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboard/ergodox_ez/keymaps/bepo/keymap.c → keyboards/ergodox/keymaps/bepo_csa/keymap.c
View File

@ -1,5 +1,5 @@
/* TypeMatrix-2030-like keymap */ /* TypeMatrix-2030-like keymap */
#include "ergodox_ez.h" #include "ergodox.h"
#include "debug.h" #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "action_util.h" #include "action_util.h"

2
quantum/keymap_extras/keymap_canadian_multilingual.h
View File

@ -1,7 +1,7 @@
#ifndef KEYMAP_CANADIAN_MULTILINGUAG_H #ifndef KEYMAP_CANADIAN_MULTILINGUAG_H
#define KEYMAP_CANADIAN_MULTILINGUAG_H #define KEYMAP_CANADIAN_MULTILINGUAG_H
#include "keymap_common.h" #include "keymap.h"
// Alt gr // Alt gr
#ifndef ALTGR #ifndef ALTGR