diff options
author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
---|---|---|
committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /keyboards/chibios_test/stm32_f103_onekey/config.h | |
parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'keyboards/chibios_test/stm32_f103_onekey/config.h')
-rw-r--r-- | keyboards/chibios_test/stm32_f103_onekey/config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/chibios_test/stm32_f103_onekey/config.h b/keyboards/chibios_test/stm32_f103_onekey/config.h new file mode 100644 index 0000000000..de0b906f35 --- /dev/null +++ b/keyboards/chibios_test/stm32_f103_onekey/config.h @@ -0,0 +1,6 @@ +#ifndef KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ +#define KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ + +#include "../config.h" + +#endif /* KEYBOARDS_CHIBIOS_TEST_STM32_F103_ONEKEY_CONFIG_H_ */ |