From 00cc0de3583bc13031e92b70bbc7bd2667aac7c3 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 19 Aug 2019 16:17:06 +0200 Subject: [PATCH] Merge #16611: build: Remove src/obj directory from repository b6e9ff899677770741d94f1cf4f61ebb13fc453f build: Remove src/obj directory from repository (Wladimir J. van der Laan) Pull request description: This directory is automatically created by the build process (in the build target directory, see #16588) and doesn't need to be in the repository nor in the tarballs. Move associated ignore directive to top-level `.gitignore` file. ACKs for top commit: hebasto: Concept ACK b6e9ff899677770741d94f1cf4f61ebb13fc453f Tree-SHA512: 5f3f5a0e8f19ecf925eb16cab327c3023b8512731bbaad5875828da7a25fdda1b77f6fbd06c002a383913627dc9b552f09ad27c57bcf0cb020ed3b1f506e5fef --- .gitignore | 1 + src/obj/.gitignore | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/obj/.gitignore diff --git a/.gitignore b/.gitignore index 7ed02e79bb..5eec05e2c6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ libtool src/config/dash-config.h src/config/dash-config.h.in src/config/stamp-h1 +src/obj share/setup.nsi share/qt/Info.plist diff --git a/src/obj/.gitignore b/src/obj/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore