From aa06893b58ac3ed88e796968d237f60f4c156875 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Mon, 20 Jun 2022 14:20:56 +1000 Subject: Add Djinn. (#17382) * Add Djinn. * Review comments. * Further cleanup. --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b1bd2609bc..e9bf3c2205 100644 --- a/.gitignore +++ b/.gitignore @@ -67,10 +67,12 @@ CMakeLists.txt .vscode/temp.sql tags -# Ignore image files +# Ignore image/font files *.gif *.jpg *.png +*.ttf +*.otf # Things Travis sees /.vs -- cgit v1.2.3 From 3c6765b21c85065cb423ccc0275c2f4915354f89 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 15 Jul 2022 03:57:34 +0100 Subject: Ignore kbfirmware exports (#17687) --- .gitignore | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e9bf3c2205..de2627d9d6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,16 +27,11 @@ quantum/version.h *.uf2 # Old-style QMK Makefiles -/keyboards/*/Makefile -/keyboards/*/*/Makefile -/keyboards/*/*/*/Makefile -/keyboards/*/*/*/*/Makefile -/keyboards/*/*/*/*/*/Makefile -/keyboards/*/keymaps/Makefile -/keyboards/*/*/keymaps/Makefile -/keyboards/*/*/*/keymaps/Makefile -/keyboards/*/*/*/*/keymaps/Makefile -/keyboards/*/*/*/*/*/keymaps/Makefile +/keyboards/**/Makefile + +# kbfirmware.... +/keyboards/**/kb.h +/keyboards/**/kb.c # Eclipse/PyCharm/Other IDE Settings *.iml -- cgit v1.2.3 From 847cca541c3666e687fc5ad6a0d3ba1733b89d81 Mon Sep 17 00:00:00 2001 From: bri <284789+b-@users.noreply.github.com> Date: Sat, 16 Jul 2022 14:38:56 -0400 Subject: Add .orig to .gitignore (#17626) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index de2627d9d6..51b0a38e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ .DS_Store ._* +# Merge files +*.orig +*.rej + # Build artifacts .clang_complete .build/ -- cgit v1.2.3