Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 18 insertions, 0 deletions

diff --git a/keyboards/vinta/vinta.c b/keyboards/vinta/vinta.c
new file mode 100644
index 0000000000..b5d40a1609
--- /dev/null
+++ b/keyboards/vinta/vinta.c
@@ -0,0 +1,18 @@
+#include "vinta.h"
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+
+    matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+
+    matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+
+    return process_record_user(keycode, record);
+}
\ No newline at end of file