Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 8 insertions, 0 deletions

diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c
new file mode 100644
index 0000000000..91bbbd453b
--- /dev/null
+++ b/keyboards/handwired/cmd60/cmd60.c
@@ -0,0 +1,8 @@
+#include "cmd60.h"
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}