summaryrefslogtreecommitdiffstats
path: root/keyboard/atomic/keymaps
diff options
context:
space:
mode:
authorAlex Johnstone <alexjj@gmail.com>2016-04-05 16:44:37 +0200
committerAlex Johnstone <alexjj@gmail.com>2016-04-05 16:44:37 +0200
commit1facc53a26294df7fb2a42f8f3d025176b8c384a (patch)
tree98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/atomic/keymaps
parent48899673af8b82638d601455f405f03db165bd57 (diff)
parent931b0a79fc071498c229b0051be0ebadd934a549 (diff)
downloadqmk_firmware-1facc53a26294df7fb2a42f8f3d025176b8c384a.tar.gz
qmk_firmware-1facc53a26294df7fb2a42f8f3d025176b8c384a.tar.xz
Merge pull request #5 from jackhumbert/master
Sync with upstream
Diffstat (limited to 'keyboard/atomic/keymaps')
-rw-r--r--keyboard/atomic/keymaps/abienz.c (renamed from keyboard/atomic/keymaps/keymap_abienz.c)0
-rw-r--r--keyboard/atomic/keymaps/default.c (renamed from keyboard/atomic/keymaps/keymap_default.c)0
-rw-r--r--keyboard/atomic/keymaps/michelle.c (renamed from keyboard/atomic/keymaps/keymap_michelle.c)0
3 files changed, 0 insertions, 0 deletions
diff --git a/keyboard/atomic/keymaps/keymap_abienz.c b/keyboard/atomic/keymaps/abienz.c
index 589a64dc4..589a64dc4 100644
--- a/keyboard/atomic/keymaps/keymap_abienz.c
+++ b/keyboard/atomic/keymaps/abienz.c
diff --git a/keyboard/atomic/keymaps/keymap_default.c b/keyboard/atomic/keymaps/default.c
index f37d9d9a5..f37d9d9a5 100644
--- a/keyboard/atomic/keymaps/keymap_default.c
+++ b/keyboard/atomic/keymaps/default.c
diff --git a/keyboard/atomic/keymaps/keymap_michelle.c b/keyboard/atomic/keymaps/michelle.c
index 2364c46a1..2364c46a1 100644
--- a/keyboard/atomic/keymaps/keymap_michelle.c
+++ b/keyboard/atomic/keymaps/michelle.c