aboutsummaryrefslogtreecommitdiffstats
path: root/keyboard/atreus/keymaps
diff options
context:
space:
mode:
authorGravatar Alex Johnstone <alexjj@gmail.com>2016-04-05 07:44:37 -0700
committerGravatar Alex Johnstone <alexjj@gmail.com>2016-04-05 07:44:37 -0700
commit1facc53a26294df7fb2a42f8f3d025176b8c384a (patch)
tree98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/atreus/keymaps
parent48899673af8b82638d601455f405f03db165bd57 (diff)
parent931b0a79fc071498c229b0051be0ebadd934a549 (diff)
downloadqmk_firmware-1facc53a26294df7fb2a42f8f3d025176b8c384a.tar.gz
Merge pull request #5 from jackhumbert/master
Sync with upstream
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