summaryrefslogtreecommitdiff
path: root/keyboard/atreus/keymaps
diff options
context:
space:
mode:
authorStephan Bösebeck2016-04-02 15:15:21 +0200
committerStephan Bösebeck2016-04-02 15:15:21 +0200
commitf0424a0c0fa4153234ad6979929e5a2426c86f21 (patch)
tree53deb01f09e9feb9a2fa11259c75411adceb2f3c /keyboard/atreus/keymaps
parent71cdfe11682cf63c262380747d8a1b3d48a6bad0 (diff)
parentaee8715815544b076c123d4ed55c76e23a7e54d0 (diff)
Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware
Diffstat (limited to 'keyboard/atreus/keymaps')
-rw-r--r--keyboard/atreus/keymaps/default.c (renamed from keyboard/atreus/keymaps/keymap_default.c)0
-rw-r--r--keyboard/atreus/keymaps/gerb.c (renamed from keyboard/atreus/keymaps/keymap_gerb.c)0
2 files changed, 0 insertions, 0 deletions
diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/default.c
index 1c4280ff5..1c4280ff5 100644
--- a/keyboard/atreus/keymaps/keymap_default.c
+++ b/keyboard/atreus/keymaps/default.c
diff --git a/keyboard/atreus/keymaps/keymap_gerb.c b/keyboard/atreus/keymaps/gerb.c
index 1ba3942e3..1ba3942e3 100644
--- a/keyboard/atreus/keymaps/keymap_gerb.c
+++ b/keyboard/atreus/keymaps/gerb.c