summaryrefslogtreecommitdiffstats
path: root/keyboard/atreus/keymaps
diff options
context:
space:
mode:
authorStephan Bösebeck <sb@caluga.de>2016-04-01 23:54:16 +0200
committerStephan Bösebeck <sb@caluga.de>2016-04-01 23:54:16 +0200
commitaee8715815544b076c123d4ed55c76e23a7e54d0 (patch)
treeea5beb11e41bf0cc0257f1a098b2218b48a83b84 /keyboard/atreus/keymaps
parentc274699085b2f922a5e8b14b21aa377249e62d29 (diff)
parentde904af36072f53d2354bff0ed36b63014ad0d61 (diff)
Merge branch 'master' of https://github.com/jackhumbert/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 1c4280ff56..1c4280ff56 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 1ba3942e3b..1ba3942e3b 100644
--- a/keyboard/atreus/keymaps/keymap_gerb.c
+++ b/keyboard/atreus/keymaps/gerb.c