ref: c4fec6596c02a6cdb6cec416f3d5bde42cd69c4b
parent: 45cde7e4a3dc80865965174f56e7e19ff73e81e8
author: Gabriel Ravier <gabravier@gmail.com>
date: Mon May 6 09:06:16 EDT 2019
Merge master into addSomeMoreStuffToGitIgnore Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
--- a/.gitignore
+++ b/.gitignore
@@ -14,16 +14,25 @@
msvc2003/devilution/orig.asm
msvc2003/devilution/compare.asm
-# Exclude build output on Linux (exclude normally produced executable files)
+# Exclude build output on Linux (exclude normally produced executable files and out files)
build_en/CSE2
build_en/CSE2d
build_en/DoConfig
build_en/DoConfigd
+*.out
+# The Makefile outputs "release" and "debug" for the english build
+build_en/release
+build_en/debug
+
build_jp/CSE2
build_jp/CSE2d
build_jp/DoConfig
build_jp/DoConfigd
+
+# The Makefile outputs "releasejp" and "debugjp" for the japanese build
+build_jp/releasejp
+build_jp/debugjp
# Exclude executables in the build folder (and .exe.manifest files)