summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/Makefile
diff options
context:
space:
mode:
authorJason Janse van Rensburg <l33tjas.0n@gmail.com>2016-08-30 14:54:00 +0200
committerJason Janse van Rensburg <l33tjas.0n@gmail.com>2016-08-30 14:54:00 +0200
commitfc2ca62a3b9552175eb7c27cc11f3a5af6cfae50 (patch)
tree59b2f2406f472a9fd2af4946420d1a1c880929c0 /keyboards/ergodox/Makefile
parenta41a7a9100b9f4c6bfdf49b39b05e626ffd95397 (diff)
parent8e00c464e6f488d86e0768a77a2ad5ee238dba6d (diff)
downloadqmk_firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.tar.gz
qmk_firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.zip
Merge branch 'master'
Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
Diffstat (limited to 'keyboards/ergodox/Makefile')
-rw-r--r--keyboards/ergodox/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
new file mode 100644
index 0000000000..7165350050
--- /dev/null
+++ b/keyboards/ergodox/Makefile
@@ -0,0 +1,5 @@
+SUBPROJECT_DEFAULT = ez
+
+ifndef MAKEFILE_INCLUDED
+ include ../../Makefile
+endif \ No newline at end of file