~ruther/qmk_firmware

1aeb59335f2fe67613df25308a630ca453975ac0 — Didier Loiseau 9 years ago b9014c7
Fixed compilation issues after the merge
R keyboard/ergodox_ez/keymaps/bepo/keymap.c => keyboards/ergodox/keymaps/bepo_csa/keymap.c +1 -1
@@ 1,5 1,5 @@
/* TypeMatrix-2030-like keymap  */
#include "ergodox_ez.h"
#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "action_util.h"

M quantum/keymap_extras/keymap_canadian_multilingual.h => quantum/keymap_extras/keymap_canadian_multilingual.h +1 -1
@@ 1,7 1,7 @@
#ifndef KEYMAP_CANADIAN_MULTILINGUAG_H
#define KEYMAP_CANADIAN_MULTILINGUAG_H

#include "keymap_common.h"
#include "keymap.h"

// Alt gr
#ifndef ALTGR