summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/.gitattributes
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-14 13:32:44 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-14 13:32:44 (GMT)
commit11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0 (patch)
tree3a35c028b91d0dc23fe3410c16d46206e9078983 /Utilities/cmlibarchive/.gitattributes
parentb8fd66f31c9399cf1ea2552b6bc8c4cae606c172 (diff)
parent5a58efaac3557b0cee27f06e49183069cd598a7f (diff)
downloadCMake-11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0.zip
CMake-11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0.tar.gz
CMake-11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0.tar.bz2
Merge topic 'update-libarchive'
5a58efaa libarchive: Avoid using name 'u_long' e2b02823 Update libarchive configuration within CMake 80883321 libarchive: Do not require includers to have windows.h dfb0458e libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LL b0a9807f libarchive: Update archive_util.c to use CMake zlib and bzip2 headers debe4dec libarchive: Drop options not present in reduced version 66b0c4fa libarchive: Do not generate a pkg-config file 8092e759 libarchive: Update README-CMake.txt for new snapshot 2f197863 Merge branch 'libarchive-upstream' into update-libarchive 23e4666c libarchive: Disable more whitespace checks in third-party code 64713ae3 libarchive 3.1.2-218-g00f4bd83 (reduced)
Diffstat (limited to 'Utilities/cmlibarchive/.gitattributes')
-rw-r--r--Utilities/cmlibarchive/.gitattributes3
1 files changed, 1 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/.gitattributes b/Utilities/cmlibarchive/.gitattributes
index be7062b..a87f192 100644
--- a/Utilities/cmlibarchive/.gitattributes
+++ b/Utilities/cmlibarchive/.gitattributes
@@ -1,2 +1 @@
-*.h whitespace=indent-with-non-tab,-blank-at-eol
-*.c whitespace=indent-with-non-tab,-blank-at-eol
+* whitespace=-indent-with-non-tab,-tab-in-indent,-blank-at-eol,-blank-at-eof