Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-24 21:21:11 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-24 21:23:25 +0300
commitd109ea5ee50f79ca9e008c7d3d4707792b9d9c36 (patch)
treebb0aef1a95389bfb38feee649cb5a07343d57c00 /build_files/build_environment/patches/.gitattributes
parentf9b1e8f000ad636456e66e7a377814d79f7d85ac (diff)
Fix make deps failing to build opencollada on Linux, due to line endings
The OpenCOLLADA package contains a mix of files with unix and dos line endings. Now we mark the diff as a binary file so that the patch also contains a mix of line endings that matches the package.
Diffstat (limited to 'build_files/build_environment/patches/.gitattributes')
-rw-r--r--build_files/build_environment/patches/.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/.gitattributes b/build_files/build_environment/patches/.gitattributes
new file mode 100644
index 00000000000..beb2d800f5b
--- /dev/null
+++ b/build_files/build_environment/patches/.gitattributes
@@ -0,0 +1,2 @@
+# Files contains mixed line endings, patch needs to preserve them to apply.
+opencollada.diff binary