summaryrefslogtreecommitdiff
path: root/keyboard/atreus/keymaps
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-03-30 13:14:01 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-03-30 13:14:01 -0400
commit5bbcc484a8e14ffb13354df4efdd460ebe7200e1 (patch)
tree65b0a4c4e659b60038ec63706c46fb21de153598 /keyboard/atreus/keymaps
parent95a88c09e18a7531a64838ceaa52df37bad8dc0d (diff)
parentae47275bf34549a0f66cb2f37daca299fd4ecdee (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